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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx    |    2 --
 writerfilter/source/dmapper/StyleSheetTable.cxx |    7 +------
 writerfilter/source/doctok/resources.xmi        |   12 ------------
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |    6 +++---
 4 files changed, 4 insertions(+), 23 deletions(-)

New commits:
commit 5e2f54d8b2c3e80e2e347e9bb00df4f8fcc2252e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 23 21:20:47 2014 +0100

    writerfilter: NS_rtf::LN_SGC -> NS_ooxml::LN_CT_Style_type
    
    Change-Id: Ie684da85620e14ae1f10c1fc8dd00ea738fafe54

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 20e64dc..82e36bd 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -223,8 +223,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
             break;
         case NS_rtf::LN_FMASSCOPY:
             break;
-        case NS_rtf::LN_SGC:
-            break;
         case NS_rtf::LN_ISTDBASE:
             break;
         case NS_rtf::LN_CUPX:
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index c7c098b..0ced6b0 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -414,7 +414,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
     // to point to a different object.
     if( m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_UNKNOWN )
     {
-        if( Name != NS_rtf::LN_SGC && Name != NS_ooxml::LN_CT_Style_type )
+        if( Name != NS_ooxml::LN_CT_Style_type )
             m_pImpl->m_pCurrentEntry->nStyleTypeCode = STYLE_TYPE_PARA;
     }
     switch(Name)
@@ -431,11 +431,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
                 m_pImpl->m_pCurrentEntry->bIsDefaultStyle = true;
         }
         break;
-        case NS_rtf::LN_SGC:
-            SAL_WARN_IF( m_pImpl->m_pCurrentEntry->nStyleTypeCode != STYLE_TYPE_UNKNOWN,
-                "writerfilter", "Style type needs to be processed first" );
-            m_pImpl->m_pCurrentEntry->nStyleTypeCode = (StyleType)nIntValue;
-        break;
         case NS_rtf::LN_ISTDBASE:
             if (static_cast<sal_uInt32>(nIntValue) != 0xfff)
                 m_pImpl->m_pCurrentEntry->sBaseStyleIdentifier = OUString::number(nIntValue, 16);
diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi
index 3ed1167e..869d155 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -248,18 +248,6 @@
             </UML:Attribute>
           </UML:Classifier.feature>
           <UML:Classifier.feature>
-            <UML:Attribute name="sgc">
-              <UML:ModelElement.taggedValue>
-                <UML:TaggedValue>
-                  <UML:TaggedValue.dataValue>rtf:SGC</UML:TaggedValue.dataValue>
-                  <UML:TaggedValue.type>
-                    <UML:TagDefinition xmi.idref="attrid"/>
-                  </UML:TaggedValue.type>
-                </UML:TaggedValue>
-              </UML:ModelElement.taggedValue>
-            </UML:Attribute>
-          </UML:Classifier.feature>
-          <UML:Classifier.feature>
             <UML:Attribute name="istdBase">
               <UML:ModelElement.taggedValue>
                 <UML:TaggedValue>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 6705664..a73c903 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1057,7 +1057,7 @@ void RTFDocumentImpl::text(OUString& rString)
                             break;
                         case DESTINATION_STYLESHEET:
                         case DESTINATION_STYLEENTRY:
-                            if (m_aStates.top().aTableAttributes.find(NS_rtf::LN_SGC))
+                            if (m_aStates.top().aTableAttributes.find(NS_ooxml::LN_CT_Style_type))
                             {
                                 RTFValue::Pointer_t pValue(new RTFValue(m_aStates.top().aDestinationText.makeStringAndClear()));
                                 m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_name, pValue);
@@ -3016,7 +3016,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
                     m_nCurrentStyleIndex = nParam;
                     m_aStates.top().aTableAttributes.set(NS_rtf::LN_ISTD, pIntValue);
                     RTFValue::Pointer_t pValue(new RTFValue(1));
-                    m_aStates.top().aTableAttributes.set(NS_rtf::LN_SGC, pValue); // paragraph style
+                    m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Style_type, pValue); // paragraph style
                 }
                 else
                    m_aStates.top().aParagraphAttributes.set(NS_rtf::LN_ISTD, pIntValue);
@@ -3028,7 +3028,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
                 m_nCurrentStyleIndex = nParam;
                 m_aStates.top().aTableAttributes.set(NS_rtf::LN_ISTD, pIntValue);
                 RTFValue::Pointer_t pValue(new RTFValue(2));
-                m_aStates.top().aTableAttributes.set(NS_rtf::LN_SGC, pValue); // character style
+                m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Style_type, pValue); // character style
             }
             else
                 m_aStates.top().aCharacterAttributes.set(NS_rtf::LN_ISTD, pIntValue);