- fixed: bibliography and line numbering config not overwritten in insert and block modes

4 files changed, 18 insertions, 12 deletions

diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index 79bb71110009..8c9825f70eea 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLIndexBibliographyConfigurationContext.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: dvo $ $Date: 2000-12-02 21:43:37 $
+ *  last change: $Author: dvo $ $Date: 2001-01-25 11:35:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,7 +128,7 @@ protected:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::xml::sax::XAttributeList> & xAttrList);
 
-    virtual void EndElement();
+    virtual void CreateAndInsert( sal_Bool bOverwrite );
 
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index ac055218b7e8..977a46117c86 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLLineNumberingImportContext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2001-01-04 14:46:31 $
+ *  last change: $Author: dvo $ $Date: 2001-01-25 11:35:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -152,7 +152,7 @@ protected:
         enum LineNumberingToken eToken,
         ::rtl::OUString sValue);
 
-    virtual void EndElement();
+    virtual void CreateAndInsert(sal_Bool bOverwrite);
 
     virtual SvXMLImportContext *CreateChildContext(
         sal_uInt16 nPrefix,
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 8e7e367ea718..6a10696386d1 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLIndexBibliographyConfigurationContext.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-16 22:19:14 $
+ *  last change: $Author: dvo $ $Date: 2001-01-25 11:35:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -273,10 +273,13 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
                                                   xAttrList);
 }
 
-void XMLIndexBibliographyConfigurationContext::EndElement()
+void XMLIndexBibliographyConfigurationContext::CreateAndInsert(
+    sal_Bool bOverwrite)
 {
     // (code almost the same as export...)
 
+    // insert and block mode is handled in insertStyleFamily
+
     // first: get field master
     // (we'll create one, and get the only master for this type)
     Reference<XMultiServiceFactory> xFactory(GetImport().GetModel(),UNO_QUERY);
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index bdb4e7ad58b3..8aa3407950ff 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLLineNumberingImportContext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-16 22:19:14 $
+ *  last change: $Author: dvo $ $Date: 2001-01-25 11:35:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -285,8 +285,11 @@ void XMLLineNumberingImportContext::ProcessAttribute(
     }
 }
 
-void XMLLineNumberingImportContext::EndElement()
+void XMLLineNumberingImportContext::CreateAndInsert(
+    sal_Bool bOverwrite)
 {
+    // insert and block mode is handled in insertStyleFamily
+
     // we'll try to get the LineNumberingProperties
     Reference<XLineNumberingProperties> xSupplier(GetImport().GetModel(),
                                                   UNO_QUERY);