diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-22 21:11:56 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-22 21:19:55 +0100 |
commit | f50fde5c2eb86c90773dd596b06900f063eba32f (patch) | |
tree | c44bb83065dee011016f351c0aa7faa7b0c6ec9b /writerfilter | |
parent | 347822a04da503b368e5168d23845766c86e39fa (diff) |
writerfilter: drop no longer needed Fib class in doctok
Change-Id: I1035148686026f0c0c27bad70c0c2e5d0f62b915
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 13 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 16 | ||||
-rw-r--r-- | writerfilter/source/doctok/resources.xmi | 128 |
4 files changed, 0 insertions, 165 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 6391727bddfa..6a584fb1bde7 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -177,12 +177,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) SectionPropertyMap * pSectionContext = m_pImpl->GetSectionContext(); PropertyMap::iterator oldPropValue; - if( nName >= NS_rtf::LN_WIDENT && nName <= NS_rtf::LN_LCBSTTBFUSSR ) - m_pImpl->GetFIB().SetData( nName, nIntValue ); - else - { - - switch( nName ) { case NS_rtf::LN_ISTD: //index of applied style @@ -243,12 +237,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_rtf::LN_FHIDDEN: break; - case NS_rtf::LN_WIDENT: - case NS_rtf::LN_LCBSTTBFUSSR: - { - m_pImpl->GetFIB().SetData( nName, nIntValue ); - } - break; case NS_ooxml::LN_CT_Border_sz: break; case NS_ooxml::LN_CT_Border_val: @@ -957,7 +945,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) #endif } } - } } void DomainMapper::lcl_sprm(Sprm & rSprm) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b3ab455bb45e..354b6eb4d5ab 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -128,14 +128,6 @@ typedef ::std::map< OUString, FieldConversion> FieldConversionMap_t; -void FIB::SetData( Id nName, sal_Int32 nValue ) -{ - OSL_ENSURE( nName >= NS_rtf::LN_WIDENT && nName <= NS_rtf::LN_LCBSTTBFUSSR, "invalid index in FIB"); - if( nName >= NS_rtf::LN_WIDENT && nName <= NS_rtf::LN_LCBSTTBFUSSR) - aFIBData[nName - NS_rtf::LN_WIDENT] = nValue; -} - - DomainMapper_Impl::DomainMapper_Impl( DomainMapper& rDMapper, uno::Reference < uno::XComponentContext > xContext, diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index fb6897af26e7..c7c7f59d4532 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -201,20 +201,6 @@ typedef std::stack< TextAppendContext > TextAppendStack; typedef std::stack<FieldContextPtr> FieldStack; typedef std::stack< AnchoredContext > TextContentStack; - - -class FIB -{ - sal_Int32 aFIBData[ NS_rtf::LN_LCBSTTBFUSSR - NS_rtf::LN_WIDENT + 1]; - public: - FIB() - { - memset(&aFIBData, 0x00, sizeof(aFIBData)); - } - - void SetData( Id nName, sal_Int32 nValue ); -}; - /*------------------------------------------------------------------------- extended tab stop struct -----------------------------------------------------------------------*/ @@ -341,7 +327,6 @@ private: TableDataHandler_t::Pointer_t m_pTableHandler; //each context needs a stack of currently used attributes - FIB m_aFIB; PropertyStack m_aPropertyStacks[NUMBER_OF_CONTEXTS]; ContextStack m_aContextStack; FontTablePtr m_pFontTable; @@ -480,7 +465,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > appendTextSectionAfter( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xBefore ); - FIB& GetFIB() {return m_aFIB;} // push the new properties onto the stack and make it the 'current' property map void PushProperties(ContextType eId); void PushStyleProperties(PropertyMapPtr pStyleProperties); diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 678937efbc94..f2350b19672e 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -333,134 +333,6 @@ </UML:Classifier.feature> </UML:Class> <!--Class Style--> - <!--Class Fib--> - <UML:Class xmi.id="Fib" name="Fib"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>898</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="size"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Attribute name="wIdent"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>(fibh) FIBH Beginning of the FIB header magic number</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="comment"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x0000</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="offset"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="shift"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue/> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="mask"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue/> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="bits"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:WIDENT</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:StructuralFeature.type> - <UML:DataType xmi.idref="U16"/> - </UML:StructuralFeature.type> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="attribute"/> - </UML:ModelElement.stereotype> - </UML:Attribute> - </UML:Classifier.feature> - <UML:Classifier.feature> - <UML:Attribute name="lcbSttbfUssr"> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue/> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="comment"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0x037E</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="offset"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>0</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="shift"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue/> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="mask"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue/> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="bits"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:ModelElement.taggedValue> - <UML:TaggedValue> - <UML:TaggedValue.dataValue>rtf:LCBSTTBFUSSR</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref="attrid"/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:StructuralFeature.type> - <UML:DataType xmi.idref="U32"/> - </UML:StructuralFeature.type> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref="attribute"/> - </UML:ModelElement.stereotype> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <!--Class Fib--> <!--Class BKF--> <UML:Class name="BKF" xmi.id="BKF"> <UML:ModelElement.taggedValue> |