diff options
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 11 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 10 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 6 |
3 files changed, 15 insertions, 12 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 987e866ed77c..b0c89ebb0c89 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: DomainMapper_Impl.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: os $ $Date: 2007-02-05 13:47:58 $ + * last change: $Author: hbrinkm $ $Date: 2007-02-21 13:34:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -464,10 +464,10 @@ void DomainMapper_Impl::PushProperties(ContextType eId) { // beginning with the second section group a section has to be inserted // into the document - SectionPropertyMap* pSectionContext = dynamic_cast< SectionPropertyMap* >( pInsert.get() ); + SectionPropertyMap* pSectionContext_ = dynamic_cast< SectionPropertyMap* >( pInsert.get() ); uno::Reference< text::XTextAppendAndConvert > xTextAppendAndConvert = m_aTextAppendStack.top(); if(xTextAppendAndConvert.is()) - pSectionContext->SetStart( xTextAppendAndConvert->getEnd() ); + pSectionContext_->SetStart( xTextAppendAndConvert->getEnd() ); } } m_aPropertyStacks[eId].push( pInsert ); @@ -1702,6 +1702,8 @@ bool lcl_FindInCommand( { } } +*/ + /*-- 11.09.2006 13:16:35--------------------------------------------------- -----------------------------------------------------------------------*/ @@ -1709,6 +1711,7 @@ bool lcl_FindInCommand( { return m_xTextField.is() || m_xTOC.is() || m_xTC.is() || m_sHyperlinkURL.getLength(); } +*/ /*-- 14.09.2006 12:46:52--------------------------------------------------- -----------------------------------------------------------------------*/ diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 9de03f935718..409d2f8d9ee7 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: PropertyMap.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: os $ $Date: 2007-02-21 12:25:06 $ + * last change: $Author: hbrinkm $ $Date: 2007-02-21 13:35:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -717,11 +717,11 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) const StyleSheetEntry* pEntry = rDM_Impl.GetStyleSheetTable()->FindStyleSheetByISTD(0); if( pEntry ) { - PropertyMap::iterator aElement = pEntry->pProperties->find(rPropNameSupplier.GetName( PROP_CHAR_HEIGHT_ASIAN )); - if( aElement != pEntry->pProperties->end()) + PropertyMap::iterator aElement_ = pEntry->pProperties->find(rPropNameSupplier.GetName( PROP_CHAR_HEIGHT_ASIAN )); + if( aElement_ != pEntry->pProperties->end()) { double fHeight; - if( aElement->second >>= fHeight ) + if( aElement_->second >>= fHeight ) nCharWidth = ConversionHelper::convertToMM100( (long)( fHeight * 20.0 + 0.5 )); } } diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 53642d5a7f8c..9f73bc37baf2 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -4,9 +4,9 @@ * * $RCSfile: StyleSheetTable.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2007-02-05 13:47:58 $ + * last change: $Author: hbrinkm $ $Date: 2007-02-21 13:36:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -930,7 +930,7 @@ const StyleSheetEntry* StyleSheetTable::FindParentStyleSheet(sal_Int32 nBaseStyl "Document Map", 0, //89 "Plain Text", 0 //90 }; - for( sal_Int32 nPair = 0; nPair < sizeof(aStyleNamePairs) / sizeof( sal_Char*) / 2; ++nPair) + for( sal_uInt32 nPair = 0; nPair < sizeof(aStyleNamePairs) / sizeof( sal_Char*) / 2; ++nPair) { //::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt = m_pImpl->m_aStyleNameMap.insert( StringPairMap_t::value_type( |