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

[Miklos Vajna]

 unusedcode.easy                              |    1 -
 writerfilter/source/dmapper/DomainMapper.cxx |   14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit bac420f9a8ba8d99213ee48ef6c2f50aba409f08
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Aug 15 09:51:04 2014 +0200

    Use DomainMapper::IsStyleSheetImport()
    
    Change-Id: I2ae8f5ed808b7f1728a95f0e9d90d671e6ef2047

diff --git a/unusedcode.easy b/unusedcode.easy
index 7ce6296..dc8ae96 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -217,6 +217,5 @@ svt::CheckInvariants(void const*)
 svt::table::TableControl_Impl::impl_checkInvariants() const
 svt::table::UnoControlTableModel::checkInvariants() const
 vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
-writerfilter::dmapper::DomainMapper::IsStyleSheetImport() const
 writerfilter::dmapper::StyleSheetTable::GetStyleIdFromIndex(unsigned int)
 writerfilter::ooxml::OOXMLBooleanValue::OOXMLBooleanValue(char const*)
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index f001d99..b5ce4a3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1150,7 +1150,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
                         "unsupported numbering level " << nIntValue);
                 break;
             }
-            if( m_pImpl->IsStyleSheetImport() )
+            if( IsStyleSheetImport() )
             {
                 //style sheets cannot have a numbering rule attached
                 StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast< StyleSheetPropertyMap* >( rContext.get() );
@@ -1165,7 +1165,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
             //convert the ListTable entry to a NumberingRules propery and apply it
             ListsManager::Pointer pListTable = m_pImpl->GetListTable();
             ListDef::Pointer pList = pListTable->GetList( nIntValue );
-            if( m_pImpl->IsStyleSheetImport() )
+            if( IsStyleSheetImport() )
             {
                 //style sheets cannot have a numbering rule attached
                 StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast< StyleSheetPropertyMap* >( rContext.get() );
@@ -1174,7 +1174,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
             }
             if( pList.get( ) )
             {
-                if( !m_pImpl->IsStyleSheetImport() )
+                if( !IsStyleSheetImport() )
                 {
                     uno::Any aRules = uno::makeAny( pList->GetNumberingRules( ) );
                     rContext->Insert( PROP_NUMBERING_RULES, aRules );
@@ -1184,7 +1184,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
             }
             else
             {
-                if( m_pImpl->IsStyleSheetImport() )
+                if( IsStyleSheetImport() )
                 {
                     // set the number id for AbstractNum references
                     StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast< StyleSheetPropertyMap* >( rContext.get() );
@@ -1376,7 +1376,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
     case NS_ooxml::LN_CT_PPrBase_outlineLvl:
         {
             sal_Int16 nLvl = static_cast< sal_Int16 >( nIntValue );
-            if( m_pImpl->IsStyleSheetImport() )
+            if( IsStyleSheetImport() )
             {
 
                 StyleSheetPropertyMap* pStyleSheetPropertyMap = dynamic_cast< StyleSheetPropertyMap* >( rContext.get() );
@@ -1600,7 +1600,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
                 }
             }
             // Make sure char sizes defined in the stylesheets don't affect char props from direct formatting.
-            if (!m_pImpl->IsStyleSheetImport())
+            if (!IsStyleSheetImport())
                 m_pImpl->deferCharacterProperty( nSprmId, uno::makeAny( nIntValue ));
             m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, (nSprmId == NS_ooxml::LN_EG_RPrBase_sz ? OUString("sz") : OUString("szCs")), OUString::number(nIntValue));
         }
@@ -1773,7 +1773,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
         // fdo#81033: for RTF, a tab stop is inherited from the style if it
         // is also applied to the paragraph directly, and cleared if it is
         // not applied to the paragraph directly => don't InitTabStopFromStyle
-        if (!m_pImpl->IsStyleSheetImport() && !IsRTFImport())
+        if (!IsStyleSheetImport() && !IsRTFImport())
         {
             uno::Any aValue = m_pImpl->GetPropertyFromStyleSheet(PROP_PARA_TAB_STOPS);
             uno::Sequence< style::TabStop > aStyleTabStops;