From a21b523f8c538124acbf4345e361436b0189b2ab Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 10 Jan 2008 10:41:17 +0000 Subject: [PATCH] INTEGRATION: CWS xmlfilter02 (1.19.2); FILE MERGED 2007/12/12 10:54:54 dr 1.19.2.7: RESYNC: (1.20-1.21); FILE MERGED 2007/11/26 14:11:52 os 1.19.2.6: default paragraph style 'Default'; numbering rules transferred from style to paragraph 2007/11/21 07:44:59 os 1.19.2.5: Border distance array access fixed 2007/11/14 12:57:07 hbrinkm 1.19.2.4: namespace clean up 2007/11/12 14:13:49 os 1.19.2.3: ooxml numbering import improved 2007/10/04 09:32:10 os 1.19.2.2: RESYNC: (1.19-1.20); FILE MERGED 2007/10/01 10:10:55 os 1.19.2.1: integration of cws writerfilter3 into cws xmlfilter02 --- writerfilter/source/dmapper/PropertyMap.cxx | 35 ++++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 6349ac37f15e..8c02cbf0614c 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: PropertyMap.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: obo $ $Date: 2007-10-29 13:55:24 $ + * last change: $Author: obo $ $Date: 2008-01-10 11:41:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,6 +65,7 @@ using namespace ::com::sun::star; +namespace writerfilter { namespace dmapper{ /*-- 21.06.2006 09:30:56--------------------------------------------------- @@ -109,10 +110,17 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues() pValues[nValue].Value = aCharStyleIter->second; ++nValue; } + PropertyMap::iterator aNumRuleIter = find(PropertyDefinition( PROP_NUMBERING_RULES, false ) ); + if( aNumRuleIter != end()) + { + pValues[nValue].Name = rPropNameSupplier.GetName( aNumRuleIter->first.eId ); + pValues[nValue].Value = aNumRuleIter->second; + ++nValue; + } PropertyMap::iterator aMapIter = begin(); for( ; nValue < m_aValues.getLength(); ++aMapIter ) { - if( aMapIter != aParaStyleIter && aMapIter != aCharStyleIter) + if( aMapIter != aParaStyleIter && aMapIter != aCharStyleIter && aMapIter != aNumRuleIter ) { pValues[nValue].Name = rPropNameSupplier.GetName( aMapIter->first.eId ); pValues[nValue].Value = aMapIter->second; @@ -438,7 +446,7 @@ void SectionPropertyMap::ApplyBorderToPageStyles( if(xSecond.is()) xSecond->setPropertyValue( sBorderName, uno::makeAny( *m_pBorderLines[nBorder] )); } - if( m_nBorderDistances[4] >= 0 ) + if( m_nBorderDistances[nBorder] >= 0 ) { const ::rtl::OUString sBorderDistanceName = rPropNameSupplier.GetName( aBorderDistanceIds[nBorder] ); xFirst->setPropertyValue( sBorderDistanceName, uno::makeAny( m_nBorderDistances[nBorder] )); @@ -593,7 +601,7 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage ) sal_Int32 nBottomMargin = m_nBottomMargin; if( HasFooter( bFirstPage ) ) { - nBottomMargin = m_nHeaderBottom; + m_nBottomMargin = m_nHeaderBottom; if( nBottomMargin > 0 && nBottomMargin > m_nHeaderBottom ) m_nHeaderBottom = nBottomMargin - m_nHeaderBottom; else @@ -620,8 +628,8 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage ) } //now set the top/bottom margin for the follow page style - operator[]( PropertyDefinition( PROP_TOP_MARGIN, false )) = uno::makeAny( nTopMargin ); - operator[]( PropertyDefinition( PROP_BOTTOM_MARGIN, false )) = uno::makeAny( nBottomMargin ); + operator[]( PropertyDefinition( PROP_TOP_MARGIN, false )) = uno::makeAny( m_nTopMargin ); + operator[]( PropertyDefinition( PROP_BOTTOM_MARGIN, false )) = uno::makeAny( m_nBottomMargin ); } /*-- 11.12.2006 08:31:46--------------------------------------------------- @@ -736,7 +744,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) { double fHeight = 0; if( aElement_->second >>= fHeight ) - nCharWidth = ConversionHelper::convertToMM100( (long)( fHeight * 20.0 + 0.5 )); + nCharWidth = ConversionHelper::convertTwipToMM100( (long)( fHeight * 20.0 + 0.5 )); } } @@ -747,11 +755,11 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) //main lives in top 20 bits, and is signed. sal_Int32 nMain = (nCharSpace & 0xFFFFF000); nMain /= 0x1000; - nCharWidth += ConversionHelper::convertToMM100( nMain * 20 ); + nCharWidth += ConversionHelper::convertTwipToMM100( nMain * 20 ); sal_Int32 nFraction = (nCharSpace & 0x00000FFF); nFraction = (nFraction * 20)/0xFFF; - nCharWidth += ConversionHelper::convertToMM100( nFraction ); + nCharWidth += ConversionHelper::convertTwipToMM100( nFraction ); } operator[]( PropertyDefinition( PROP_GRID_BASE_HEIGHT, false )) = uno::makeAny( nCharWidth ); sal_Int32 nRubyHeight = m_nGridLinePitch - nCharWidth; @@ -803,7 +811,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) catch( const uno::Exception& rEx) { (void)rEx; - } + } } } /*-- 11.12.2006 08:31:46--------------------------------------------------- @@ -869,7 +877,9 @@ StyleSheetPropertyMap::StyleSheetPropertyMap() : mbCT_TrPrBase_jcSet( false ), mbCT_TcPrBase_vAlignSet( false ), mbCT_TblWidth_wSet( false ), - mbCT_TblWidth_typeSet( false ) + mbCT_TblWidth_typeSet( false ), + mnListId( -1 ), + mnListLevel( -1 ) { } /*-- 14.06.2007 13:57:43--------------------------------------------------- @@ -880,3 +890,4 @@ StyleSheetPropertyMap::~StyleSheetPropertyMap() } }//namespace dmapper +}//namespace writerfilter