[Libreoffice-commits] .: 2 commits - writerfilter/source

[Lubos Lunak]

 writerfilter/source/dmapper/DomainMapper.cxx |   56 +++++++++++++--------------
 writerfilter/source/dmapper/FontTable.cxx    |   11 ++++-
 writerfilter/source/dmapper/FontTable.hxx    |    2 
 3 files changed, 39 insertions(+), 30 deletions(-)

New commits:
commit 1f4c43f7094f7817e8f44ec72ceba2e69a5bb629
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Mar 2 17:28:16 2011 +0100

    fix indentation

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index c1b12f1..df02700 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -981,10 +981,10 @@ void DomainMapper::attribute(Id nName, Value & val)
             if (m_pImpl->GetTopContext())
                 m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_ASIAN, true, uno::makeAny( sStringValue ));
             break;
-    case NS_ooxml::LN_CT_Fonts_eastAsiaTheme:
-        if (m_pImpl->GetTopContext())
-            m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, true, uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme(nIntValue) ) );
-        break;
+        case NS_ooxml::LN_CT_Fonts_eastAsiaTheme:
+            if (m_pImpl->GetTopContext())
+                m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, true, uno::makeAny( m_pImpl->GetThemeTable()->getFontNameForTheme(nIntValue) ) );
+            break;
         case NS_ooxml::LN_CT_Fonts_cs:
             if (m_pImpl->GetTopContext())
                 m_pImpl->GetTopContext()->Insert(PROP_CHAR_FONT_NAME_COMPLEX, true, uno::makeAny( sStringValue ));
@@ -1371,36 +1371,36 @@ void DomainMapper::attribute(Id nName, Value & val)
         case NS_ooxml::LN_CT_Color_themeShade:
             //unsupported
         break;
-    case NS_ooxml::LN_endtrackchange:
-        m_pImpl->RemoveCurrentRedline( );
-    break;
-    case NS_ooxml::LN_CT_DocGrid_linePitch:
+        case NS_ooxml::LN_endtrackchange:
+            m_pImpl->RemoveCurrentRedline( );
+        break;
+        case NS_ooxml::LN_CT_DocGrid_linePitch:
+        {
+            //see SwWW8ImplReader::SetDocumentGrid
+            OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
+            if(pSectionContext)
             {
-                //see SwWW8ImplReader::SetDocumentGrid
-                OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
-                if(pSectionContext)
-                {
-                    pSectionContext->SetGridLinePitch( ConversionHelper::convertTwipToMM100( nIntValue ) );
-                }
+                pSectionContext->SetGridLinePitch( ConversionHelper::convertTwipToMM100( nIntValue ) );
             }
+        }
         break;  
-            case NS_ooxml::LN_CT_DocGrid_charSpace:
+        case NS_ooxml::LN_CT_DocGrid_charSpace:
+        {
+            OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
+            if(pSectionContext)
             {
-                OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
-                if(pSectionContext)
-                {
-                    pSectionContext->SetDxtCharSpace( nIntValue );
-                }                
-            }    
-            break;
-            case NS_ooxml::LN_CT_DocGrid_type:
+                pSectionContext->SetDxtCharSpace( nIntValue );
+            }
+        }
+        break;
+        case NS_ooxml::LN_CT_DocGrid_type:
+        {
+            if (pSectionContext != NULL)
             {
-                if (pSectionContext != NULL)
-                {
-                    pSectionContext->SetGridType(nIntValue);
-                }
+                pSectionContext->SetGridType(nIntValue);
             }
-            break;
+        }
+        break;
         default:
             {
 #if OSL_DEBUG_LEVEL > 0
commit 889431fad7b7e4b5d247e93e963d4fe084d90f3e
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Mar 2 16:52:31 2011 +0100

    read w:charset , not used later though it seems (part of fdo#34814)

diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 36da245..8410780 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -33,6 +33,7 @@
 #endif
 #include <vector>
 #include <stdio.h>
+#include <rtl/tencinfo.h>
 
 namespace writerfilter {
 namespace dmapper
@@ -116,12 +117,20 @@ void FontTable::sprm(Sprm& rSprm)
     if(!m_pImpl->pCurrentEntry)
         return ;
     sal_uInt32 nSprmId = rSprm.getId();
-    (void)nSprmId;
 
     Value::Pointer_t pValue = rSprm.getValue();
     sal_Int32 nIntValue = pValue->getInt();
     (void)nIntValue;
     rtl::OUString sStringValue = pValue->getString();
+    switch(nSprmId)
+    {
+        case NS_ooxml::LN_CT_Font_charset:
+            m_pImpl->pCurrentEntry->nTextEncoding = rtl_getTextEncodingFromWindowsCharset( nIntValue );
+        break;
+        default:
+        break;
+    }
+
 }
 
 void FontTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref)
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index 4a729da..84f0b02 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -57,7 +57,7 @@ struct FontEntry
     FontEntry() :
         bTrueType(false),
         nPitchRequest( 0 ),
-        nTextEncoding( 0 ),
+        nTextEncoding( RTL_TEXTENCODING_DONTKNOW ),
         nFontFamilyId( 0 ),
         nBaseWeight( 0 ),
         nAltFontIndex( 0 )