Complete use of DefaultNumbering component

2 files changed, 16 insertions, 10 deletions

diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index cca4e3edf767..f59c68e70fae 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: writer.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mib $ $Date: 2001-01-22 12:29:52 $
+ *  last change: $Author: os $ $Date: 2001-02-27 14:59:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -482,8 +482,8 @@ void Writer::PutNumFmtFontsInAttrPool()
     for( USHORT nGet = rListTbl.Count(); nGet; )
         if( pDoc->IsUsed( *(pRule = rListTbl[ --nGet ] )))
             for( BYTE nLvl = 0; nLvl < MAXLEVEL; ++nLvl )
-                if( SVX_NUM_CHAR_SPECIAL == (pFmt = &pRule->Get( nLvl ))->eType ||
-                    SVX_NUM_BITMAP == pFmt->eType )
+                if( SVX_NUM_CHAR_SPECIAL == (pFmt = &pRule->Get( nLvl ))->GetNumberingType() ||
+                    SVX_NUM_BITMAP == pFmt->GetNumberingType() )
                 {
                     if( 0 == ( pFont = pFmt->GetBulletFont() ) )
                         pFont = pDefFont;
@@ -658,11 +658,14 @@ ULONG StgWriter::Write( SwPaM& rPaM, SvStorage& rStg, const String* pFName )
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/writer/writer.cxx,v 1.7 2001-01-22 12:29:52 mib Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/writer/writer.cxx,v 1.8 2001-02-27 14:59:28 os Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.7  2001/01/22 12:29:52  mib
+      Block mode for Writers added
+
       Revision 1.6  2000/11/27 19:09:58  jp
       Bug #80732#: AddPutEditEngFontsInAttrPool: use the correct Itempool
 
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2b8496c74a2c..f8f618ec674a 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ww8par.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: cmc $ $Date: 2001-02-20 15:24:20 $
+ *  last change: $Author: os $ $Date: 2001-02-27 15:03:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2349,7 +2349,7 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss)
 
                 aInfo.ePos = FTNPOS_PAGE;
                 aInfo.eNum = eNumA[pWDop->rncFtn];
-                aInfo.aFmt.eType = eNumTA[pWDop->nfcFtnRef];
+                aInfo.aFmt.SetNumberingType(eNumTA[pWDop->nfcFtnRef]);
                 if( pWDop->nFtn )
                     aInfo.nFtnOffset = pWDop->nFtn - 1;
                 rDoc.SetFtnInfo( aInfo );
@@ -2360,7 +2360,7 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss)
 
                 // Ich kann nicht setzen, wann neu nummerieren...
                 //  aInfo.eNum = eNumA[pWDop->pDop->rncEdn];
-                aInfo.aFmt.eType = eNumTA[pWDop->nfcEdnRef];
+                aInfo.aFmt.SetNumberingType(eNumTA[pWDop->nfcEdnRef]);
                 if( pWDop->nEdn )
                     aInfo.nFtnOffset = pWDop->nEdn - 1;
                 rDoc.SetEndNoteInfo( aInfo );
@@ -3048,11 +3048,14 @@ void SwMSDffManager::ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd,
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par.cxx,v 1.12 2001-02-20 15:24:20 cmc Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par.cxx,v 1.13 2001-02-27 15:03:08 os Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.12  2001/02/20 15:24:20  cmc
+      #84095# Footnotes in field results that are being ignored shouldn't therefore be inserted
+
       Revision 1.11  2001/02/16 10:08:12  cmc
       Normalize japanese doptypography variable names