[ooo-build-commit] patches/dev300

Cédric Bosdonnat cbosdo at kemper.freedesktop.org
Mon Jun 29 01:07:35 PDT 2009


 patches/dev300/docx-import-fixes.diff |  257 ++++++++++++++++++++++++++++++----
 1 file changed, 232 insertions(+), 25 deletions(-)

New commits:
commit 634439cbf4de903ac365d250fab9e0a1c7fca477
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon Jun 29 10:04:22 2009 +0200

    Docx import: sections fixes
    
    Fixed the import of the page sections to reduce the number of dummy page
    styles imported.
    
    Removed the collapsed paragraphs at the end of the sections.
    
    n#514645: Fixed the page breaks import problems.
    
    * patches/dev300/docx-import-fixes.diff:

diff --git a/patches/dev300/docx-import-fixes.diff b/patches/dev300/docx-import-fixes.diff
index 6fb5240..cc92b01 100644
--- a/patches/dev300/docx-import-fixes.diff
+++ b/patches/dev300/docx-import-fixes.diff
@@ -1646,7 +1646,7 @@ index 18196b3..a3bde53 100644
  
      rToFill.Color = nLineColor;
 diff --git writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapper.cxx
-index 5758176..a4b46ac 100644
+index 5758176..4fd3e61 100644
 --- writerfilter/source/dmapper/DomainMapper.cxx
 +++ writerfilter/source/dmapper/DomainMapper.cxx
 @@ -28,9 +28,12 @@
@@ -1903,7 +1903,46 @@ index 5758176..a4b46ac 100644
  #endif
          }
      }
-@@ -4224,19 +4263,44 @@ void DomainMapper::endParagraphGroup()
+@@ -4183,38 +4222,6 @@ void DomainMapper::startParagraphGroup()
+ -----------------------------------------------------------------------*/
+ void DomainMapper::endParagraphGroup()
+ {
+-    //handle unprocessed deferred breaks
+-    PropertyMapPtr pParaProperties = m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH);
+-    if( pParaProperties->hasEmptyPropertyValues() )
+-    {
+-        PropertyMap::const_iterator aIter = pParaProperties->find(PropertyDefinition( PROP_BREAK_TYPE , false ) );
+-        if( aIter != pParaProperties->end() )
+-        {
+-            style::BreakType eType;
+-            aIter->second >>= eType;
+-            bool bPage = false;
+-            bool bColumn = false;
+-            if( eType == style::BreakType_PAGE_BEFORE )
+-                bPage = true;
+-            else if( eType == style::BreakType_COLUMN_BEFORE )
+-                 bColumn = true;
+-
+-            if( bPage || bColumn )
+-            {
+-                try
+-                {
+-                        uno::Reference< beans::XPropertySet > xRangeProperties( m_pImpl->GetTopTextAppend()->getEnd(), uno::UNO_QUERY_THROW );
+-                        xRangeProperties->setPropertyValue(
+-                            PropertyNameSupplier::GetPropertyNameSupplier().GetName(PROP_BREAK_TYPE),
+-                                                    uno::makeAny( bPage ? style::BreakType_PAGE_BEFORE : style::BreakType_COLUMN_BEFORE));
+-                }
+-                catch( const uno::Exception& )
+-                {
+-                }
+-            }
+-        }
+-    }
+-
+     m_pImpl->PopProperties(CONTEXT_PARAGRAPH);
+     m_pImpl->getTableManager().endParagraphGroup();
+     //frame conversion has to be executed after table conversion
+@@ -4224,19 +4231,44 @@ void DomainMapper::endParagraphGroup()
  #endif
  }
  
@@ -1950,7 +1989,7 @@ index 5758176..a4b46ac 100644
  }
  /*-- 28.01.2008 14:52:33---------------------------------------------------
  
-@@ -4483,10 +4547,13 @@ void DomainMapper::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
+@@ -4483,10 +4515,13 @@ void DomainMapper::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
          break;
      case NS_ooxml::LN_NUMBERING:
      case NS_rtf::LN_LISTTABLE:
@@ -1967,7 +2006,7 @@ index 5758176..a4b46ac 100644
          break;
      case NS_rtf::LN_LFOTABLE:
          /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
-@@ -4496,6 +4563,9 @@ void DomainMapper::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
+@@ -4496,6 +4531,9 @@ void DomainMapper::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
      case NS_ooxml::LN_THEMETABLE:
          ref->resolve ( *m_pImpl->GetThemeTable() );
      break;
@@ -1977,7 +2016,16 @@ index 5758176..a4b46ac 100644
      default:
          OSL_ENSURE( false, "which table is to be filled here?");
      }
-@@ -4818,5 +4888,10 @@ uno::Reference< text::XTextRange > DomainMapper::GetCurrentTextRange()
+@@ -4581,7 +4619,7 @@ void DomainMapper::substream(Id rName, ::writerfilter::Reference<Stream>::Pointe
+         m_pImpl->PopAnnotation();
+     break;
+     }
+-
++    
+     m_pImpl->getTableManager().endLevel();
+ 
+ #ifdef DEBUG_DOMAINMAPPER
+@@ -4818,5 +4856,10 @@ uno::Reference< text::XTextRange > DomainMapper::GetCurrentTextRange()
      return pStyleSheets->getOrCreateCharStyle( rCharProperties );
  }
  
@@ -3104,7 +3152,7 @@ index c183252..d301acf 100644
  
  }}
 diff --git writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx
-index 051a2b8..77ed1aa 100644
+index 051a2b8..a7c10ce 100644
 --- writerfilter/source/dmapper/DomainMapper_Impl.cxx
 +++ writerfilter/source/dmapper/DomainMapper_Impl.cxx
 @@ -36,6 +36,8 @@
@@ -3193,12 +3241,12 @@ index 051a2b8..77ed1aa 100644
 +        (void)rEx;
 +    }
 +}
-+    
++
 +void DomainMapper_Impl::SetIsLastParagraphInSection( bool bIsLast )
 +{
 +    m_bIsLastParaInSection = bIsLast;
 +}
-+
++   
  /*-------------------------------------------------------------------------
  
    -----------------------------------------------------------------------*/
@@ -5289,7 +5337,7 @@ index c9acac7..b46e502 100644
  struct PropertyNameSupplier_Impl;
  class PropertyNameSupplier
 diff --git writerfilter/source/dmapper/PropertyMap.cxx writerfilter/source/dmapper/PropertyMap.cxx
-index 0ca1023..e41a71a 100644
+index 0ca1023..01f2cf4 100644
 --- writerfilter/source/dmapper/PropertyMap.cxx
 +++ writerfilter/source/dmapper/PropertyMap.cxx
 @@ -35,6 +35,8 @@
@@ -5309,7 +5357,7 @@ index 0ca1023..e41a71a 100644
      ,m_bTitlePage( false )
      ,m_nColumnCount( 0 )
      ,m_nColumnDistance( 1249 )
-@@ -375,21 +378,6 @@ void SectionPropertyMap::ApplyBorderToPageStyles(
+@@ -375,32 +378,21 @@ void SectionPropertyMap::ApplyBorderToPageStyles(
      sal_Int32 nOffsetFrom = (nValue & 0x00E0) >> 5;
      //sal_Int32 bPageDepth = (nValue & 0x0018) >> 3; //unused infromation: 0 - in front 1 - in back
      //todo: negative spacing (from ww8par6.cxx)
@@ -5331,25 +5379,44 @@ index 0ca1023..e41a71a 100644
      switch( nValue & 0x07)
      {
          case 0: /*all styles*/
-@@ -420,8 +408,16 @@ void SectionPropertyMap::ApplyBorderToPageStyles(
+-            xFirst = GetPageStyle( xPageStyles, xTextFactory, false );
+-            xSecond = GetPageStyle( xPageStyles, xTextFactory, true );
++            if ( m_sFollowPageStyleName.getLength( ) > 0 )
++                xFirst = GetPageStyle( xPageStyles, xTextFactory, false );
++            if ( m_sFirstPageStyleName.getLength( ) > 0 )
++                xSecond = GetPageStyle( xPageStyles, xTextFactory, true );
+         break;
+         case 1: /*first page*/
+-            xFirst = GetPageStyle( xPageStyles, xTextFactory, true );
++            if ( m_sFirstPageStyleName.getLength( ) > 0 )
++                xFirst = GetPageStyle( xPageStyles, xTextFactory, true );
+         break;
+         case 2: /*left and right*/
+-            xFirst  = GetPageStyle( xPageStyles, xTextFactory, false );
++            if ( m_sFollowPageStyleName.getLength( ) > 0 )
++                xFirst  = GetPageStyle( xPageStyles, xTextFactory, false );
+         break;
+         case 3: //whole document?
+             //todo: how to apply a border to the whole document - find all sections or access all page styles?
+@@ -420,8 +412,16 @@ void SectionPropertyMap::ApplyBorderToPageStyles(
          PROP_LEFT_BORDER_DISTANCE,
          PROP_RIGHT_BORDER_DISTANCE,
          PROP_TOP_BORDER_DISTANCE,
 -        PROP_BOTTOM_BORDER_DISTANCE,
 +        PROP_BOTTOM_BORDER_DISTANCE
-+    };
+     };
 +    static const PropertyIds aMarginIds[4] = 
 +    {
 +        PROP_LEFT_MARGIN,
 +        PROP_RIGHT_MARGIN,
 +        PROP_TOP_MARGIN,
 +        PROP_BOTTOM_MARGIN
-     };
++    };
 +
      PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
      for( sal_Int32 nBorder = 0; nBorder < 4; ++nBorder)
      {
-@@ -434,19 +430,38 @@ void SectionPropertyMap::ApplyBorderToPageStyles(
+@@ -434,19 +434,38 @@ void SectionPropertyMap::ApplyBorderToPageStyles(
          }
          if( m_nBorderDistances[nBorder] >= 0 )
          {
@@ -5395,7 +5462,7 @@ index 0ca1023..e41a71a 100644
  /*-- 14.12.2006 12:50:06---------------------------------------------------
  
    -----------------------------------------------------------------------*/
-@@ -724,8 +739,8 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
+@@ -724,8 +743,8 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
  
          sal_Int32 nCharWidth = 423; //240 twip/ 12 pt
          //todo: is '0' the right index here?
@@ -5406,7 +5473,7 @@ index 0ca1023..e41a71a 100644
          {
              PropertyMap::iterator aElement_ = pEntry->pProperties->find(PropertyDefinition( PROP_CHAR_HEIGHT_ASIAN, false ));
              if( aElement_ != pEntry->pProperties->end())
-@@ -764,6 +779,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
+@@ -764,6 +783,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
              uno::Reference< beans::XPropertySet > xFirstPageStyle = GetPageStyle(
                                  rDM_Impl.GetPageStyles(), rDM_Impl.GetTextFactory(), true );
              _ApplyProperties( xFirstPageStyle );
@@ -5414,17 +5481,16 @@ index 0ca1023..e41a71a 100644
              sal_Int32 nPaperBin = m_nFirstPaperBin >= 0 ? m_nFirstPaperBin : m_nPaperBin >= 0 ? m_nPaperBin : 0;
              if( nPaperBin )
                  xFollowPageStyle->setPropertyValue( sTrayIndex, uno::makeAny( nPaperBin ) );
-@@ -771,6 +787,9 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
+@@ -771,6 +791,8 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
                  xFollowPageStyle->setPropertyValue(
                      rPropNameSupplier.GetName( PROP_TEXT_COLUMNS ), uno::makeAny( xColumns ));
          }
-+            
-+        ApplyBorderToPageStyles( rDM_Impl.GetPageStyles( ), rDM_Impl.GetTextFactory( ), m_nBorderParams );
 +
++        ApplyBorderToPageStyles( rDM_Impl.GetPageStyles( ), rDM_Impl.GetTextFactory( ), m_nBorderParams );
          try
          {
  //            if( m_xStartingRange.is() )
-@@ -778,7 +797,11 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
+@@ -778,28 +800,24 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
                  //now apply this break at the first paragraph of this section
                  uno::Reference< beans::XPropertySet > xRangeProperties;
                  if( m_bIsFirstSection )
@@ -5437,7 +5503,35 @@ index 0ca1023..e41a71a 100644
                  else
                      xRangeProperties = uno::Reference< beans::XPropertySet >( m_xStartingRange, uno::UNO_QUERY_THROW );
              /* break type
-@@ -875,7 +898,8 @@ StyleSheetPropertyMap::StyleSheetPropertyMap() :
+             0 - No break 1 - New Colunn 2 - New page 3 - Even page 4 - odd page */
+-                if( m_nBreakType == 2 || m_nBreakType == 3)
+-                {
+-                    xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_BREAK_TYPE),
+-                        uno::makeAny( m_nBreakType == 2 ? style::BreakType_COLUMN_AFTER : style::BreakType_PAGE_AFTER  ) );
+-                }
+-                else
+-                {
+-                    xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_DESC_NAME ),
+-                        uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName ));
++                xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_DESC_NAME ),
++                    uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName ));
+     //  todo: page breaks with odd/even page numbering are not available - find out current page number to check how to change the number
+     //  or add even/odd page break types
+-                    if(m_bPageNoRestart || m_nPageNumber >= 0)
+-                    {
+-                        sal_Int16 nPageNumber = m_nPageNumber >= 0 ? static_cast< sal_Int16 >(m_nPageNumber) : 1;
+-                        xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_NUMBER_OFFSET ),
+-                            uno::makeAny( nPageNumber ));
+-                    }
++                if(m_bPageNoRestart || m_nPageNumber >= 0)
++                {
++                    sal_Int16 nPageNumber = m_nPageNumber >= 0 ? static_cast< sal_Int16 >(m_nPageNumber) : 1;
++                    xRangeProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_PAGE_NUMBER_OFFSET ),
++                        uno::makeAny( nPageNumber ));
+                 }
+             }
+         }
+@@ -875,7 +893,8 @@ StyleSheetPropertyMap::StyleSheetPropertyMap() :
      mbCT_TblWidth_wSet( false ),
      mbCT_TblWidth_typeSet( false ),
      mnListId( -1 ),
@@ -7070,6 +7164,59 @@ index 012b45d..5f42164 100644
  
  # --- Targets ----------------------------------
  
+diff --git writerfilter/source/ooxml/OOXMLDocumentImpl.cxx writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+index 542cf81..41a3e6c 100644
+--- writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
++++ writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+@@ -48,7 +48,7 @@ using namespace ::std;
+ 
+ OOXMLDocumentImpl::OOXMLDocumentImpl
+ (OOXMLStream::Pointer_t pStream)
+-: mpStream(pStream), mXNoteType(0)
++: mpStream(pStream), mXNoteType(0), mbIsSubstream( false )
+ {
+ }
+ 
+@@ -138,6 +138,7 @@ OOXMLDocumentImpl::getSubStream(const rtl::OUString & rId)
+     writerfilter::Reference<Stream>::Pointer_t pRet( pTemp = new OOXMLDocumentImpl(pStream) );
+     pTemp->setModel(mxModel);
+     pTemp->setShapes(mxShapes);
++    pTemp->setIsSubstream( true );
+     return pRet;
+ }
+ 
+@@ -317,6 +318,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
+         pDocHandler->setStream(&rStream);
+         pDocHandler->setDocument(this);
+         pDocHandler->setXNoteId(msXNoteId);
++        pDocHandler->setIsSubstream( mbIsSubstream );
+         uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
+             (pDocHandler);
+         uno::Reference < xml::sax::XFastTokenHandler > xTokenHandler
+diff --git writerfilter/source/ooxml/OOXMLDocumentImpl.hxx writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+index 7d736b3..5f8cad7 100644
+--- writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
++++ writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+@@ -53,6 +53,8 @@ class OOXMLDocumentImpl : public OOXMLDocument
+     uno::Reference<frame::XModel> mxModel;
+     uno::Reference<drawing::XShapes> mxShapes;
+ 
++    bool mbIsSubstream;
++
+ protected:
+     virtual void resolveFastSubStream(Stream & rStream, 
+                                       OOXMLStream::StreamType_t nType);
+@@ -69,6 +71,10 @@ protected:
+                    const Id & rType,
+                    const rtl::OUString & rNoteId);
+ 
++    writerfilter::Reference<Stream>::Pointer_t;
++
++    void setIsSubstream( bool bSubstream ) { mbIsSubstream = bSubstream; };
++
+ public:
+     OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream);
+     virtual ~OOXMLDocumentImpl();
 diff --git writerfilter/source/ooxml/OOXMLFastContextHandler.cxx writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
 index c6e81d5..5e168cd 100644
 --- writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -7264,6 +7411,33 @@ index 33ad4b4..0958671 100644
      OOXMLPropertySet::Pointer_t mpPropertySet;
  
      OOXMLFastContextHandler * getFastContextHandler() const;
+diff --git writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+index 2557387..71a0065 100644
+--- writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
++++ writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+@@ -225,4 +225,9 @@ void OOXMLFastDocumentHandler::setXNoteId(const ::rtl::OUString & rXNoteId)
+     msXNoteId = rXNoteId;
+ }
+ 
++void OOXMLFastDocumentHandler::setIsSubstream( bool bSubstream ) 
++{ 
++    getContextHandler( )->getParserState( )->setInSectionGroup( bSubstream ); 
++};
++
+ }}
+diff --git writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+index c7dfefe..b8ed9a5 100644
+--- writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
++++ writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+@@ -100,6 +100,8 @@ public:
+     
+     OOXMLParserState::Pointer_t getParserState() const;
+ 
++    void setIsSubstream( bool bSubstream );
++
+ private:
+     OOXMLFastDocumentHandler(OOXMLFastDocumentHandler &); // not defined
+     void operator =(OOXMLFastDocumentHandler &); // not defined
 diff --git writerfilter/source/ooxml/makefile.mk writerfilter/source/ooxml/makefile.mk
 index 29df82f..35f7db7 100644
 --- writerfilter/source/ooxml/makefile.mk
@@ -7301,7 +7475,7 @@ index 29df82f..35f7db7 100644
  $(OOXMLHXXOUTDIRCREATED):
  	$(MKDIRHIER) $(OOXMLHXXOUTDIR)
 diff --git writerfilter/source/ooxml/model.xml writerfilter/source/ooxml/model.xml
-index 8eadd58..add4a80 100644
+index 8eadd58..7d07b6a 100644
 --- writerfilter/source/ooxml/model.xml
 +++ writerfilter/source/ooxml/model.xml
 @@ -1,23 +1,24 @@
@@ -7600,7 +7774,27 @@ index 8eadd58..add4a80 100644
        <action name="end" action="sendPropertiesWithId" sendtokenid="ooxml:object"/>
        <action name="end" action="clearProps"/>
      </resource>
-@@ -22251,6 +22278,8 @@
+@@ -22021,18 +22048,13 @@
+     <resource xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" name="CT_HdrFtrRef" resource="Properties">
+       <attribute name="type" tokenid="ooxml:CT_HdrFtrRef_type"/>
+       <attribute name="r:id" tokenid="ooxml:CT_HdrFtrRef_id"/>
+-      <action name="end" action="endCharacterGroup"/>
+-      <action name="end" action="endParagraphGroup"/>
+       <action name="end" action="handleHdrFtr"/>
+     </resource>
+     <resource name="EG_HdrFtrReferences" resource="Properties">
+       <element name="headerReference" tokenid="ooxml:EG_HdrFtrReferences_headerReference"/>
+       <element name="footerReference" tokenid="ooxml:EG_HdrFtrReferences_footerReference"/>
+     </resource>
+-    <resource name="CT_HdrFtr" resource="Stream">
+-      <action name="start" action="startSectionGroup"/>
+-      <action name="end" action="endSectionGroup"/>
+-    </resource>
++    <resource name="CT_HdrFtr" resource="Stream"/>
+     <resource name="EG_SectPrContents" resource="Properties">
+       <element name="bidi" tokenid="ooxml:EG_SectPrContents_bidi"/>
+       <element name="cols" tokenid="ooxml:EG_SectPrContents_cols"/>
+@@ -22251,6 +22273,8 @@
      <resource name="CT_RPrOriginal" resource="Properties"/>
      <resource name="CT_ParaRPrOriginal" resource="Properties"/>
      <resource name="CT_ParaRPr" resource="Properties">
@@ -7609,7 +7803,7 @@ index 8eadd58..add4a80 100644
        <element name="rPrChange" tokenid="ooxml:CT_ParaRPr_rPrChange"/>
      </resource>
      <resource name="ST_RubyAlign" resource="List" generated="yes">
-@@ -22863,20 +22892,20 @@
+@@ -22863,20 +22887,20 @@
        <element name="num" tokenid="ooxml:CT_Numbering_num"/>
        <element name="numIdMacAtCleanup" tokenid="ooxml:CT_Numbering_numIdMacAtCleanup"/>
      </resource>
@@ -7644,7 +7838,7 @@ index 8eadd58..add4a80 100644
      </resource>
      <resource name="ST_StyleType" resource="List">
        <value tokenid="1">paragraph</value>
-@@ -22884,6 +22913,14 @@
+@@ -22884,6 +22908,14 @@
        <value tokenid="3">table</value>
        <value tokenid="4">numbering</value>
      </resource>
@@ -7906,6 +8100,19 @@ index 9b17e4d..7296cbd 100644
      <xsl:for-each select="ancestor::namespace/resource[@name = $name]//action[@name='characters']">
        <xsl:call-template name="chooseaction"/>
      </xsl:for-each>
+diff --git writerfilter/source/resourcemodel/TagLogger.cxx writerfilter/source/resourcemodel/TagLogger.cxx
+index ff23dfc..97f3f28 100644
+--- writerfilter/source/resourcemodel/TagLogger.cxx
++++ writerfilter/source/resourcemodel/TagLogger.cxx
+@@ -273,7 +273,7 @@ namespace writerfilter
+             
+             fileName += "/writerfilter.";
+             fileName += name;
+-            fileName += ".tmp";
++            fileName += ".xml";
+ 
+             ofstream dumpStream(fileName.c_str());
+             aIt->second->output(dumpStream);
 diff --git writerfilter/source/resourcemodel/WW8Analyzer.cxx writerfilter/source/resourcemodel/WW8Analyzer.cxx
 index 0bcf198..a3d70cf 100644
 --- writerfilter/source/resourcemodel/WW8Analyzer.cxx


More information about the ooo-build-commit mailing list