[Libreoffice-commits] core.git: writerfilter/source

[Chris Sherlock]

 writerfilter/source/dmapper/FontTable.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f3854df014f94884492b7a81b7bc865d922cfda3
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date:   Mon Mar 17 20:48:43 2014 +1100

    Handle altname in docx's fonttable.xml
    
    We don't actually need to do anything with altname, so just break.
    
    Change-Id: I4b20d762c730675acb79ea1a4f0c5c14e7b86752
    Reviewed-on: https://gerrit.libreoffice.org/8616
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
    Tested-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/writerfilter/source/dmapper/FontTable.cxx 
b/writerfilter/source/dmapper/FontTable.cxx
index 0ed3f3a..ec2d7c7 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -74,7 +74,7 @@ void FontTable::lcl_attribute(Id Name, Value & val)
             break;
         case NS_ooxml::LN_CT_Font_name:
             m_pImpl->pCurrentEntry->sFontName = sValue;
-        break;
+            break;
         case NS_ooxml::LN_CT_Charset_val:
             // w:characterSet has higher priority, set only if that one is not 
set
             if( m_pImpl->pCurrentEntry->nTextEncoding == 
RTL_TEXTENCODING_DONTKNOW )
@@ -83,7 +83,7 @@ void FontTable::lcl_attribute(Id Name, Value & val)
                 if( IsStarSymbol( m_pImpl->pCurrentEntry->sFontName ))
                     m_pImpl->pCurrentEntry->nTextEncoding = 
RTL_TEXTENCODING_SYMBOL;
             }
-        break;
+            break;
         case NS_ooxml::LN_CT_Charset_characterSet:
         {
             OString tmp;
@@ -92,7 +92,7 @@ void FontTable::lcl_attribute(Id Name, Value & val)
             // Older LO versions used to write incorrect character set for 
OpenSymbol, fix.
             if( IsStarSymbol( m_pImpl->pCurrentEntry->sFontName ))
                 m_pImpl->pCurrentEntry->nTextEncoding = 
RTL_TEXTENCODING_SYMBOL;
-        break;
+            break;
         }
         default:
         {
@@ -137,6 +137,8 @@ void FontTable::lcl_sprm(Sprm& rSprm)
             }
             break;
         }
+        case NS_ooxml::LN_CT_Font_altName:
+            break;
         case NS_ooxml::LN_CT_Font_panose1:
             break;
         case NS_ooxml::LN_CT_Font_family:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits