Move SvXMLAttrContainerItem to SVX, moved writer only code to sw

5 files changed, 21 insertions, 43 deletions

diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk
index 30bb9b2265fc..1fe35e3c609e 100644
--- a/xmloff/source/style/makefile.mk
+++ b/xmloff/source/style/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.21 $
+#   $Revision: 1.22 $
 #
-#   last change: $Author: bm $ $Date: 2001-05-22 08:04:54 $
+#   last change: $Author: mib $ $Date: 2001-07-04 13:52:07 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -109,15 +109,10 @@ CXXFILES = \
         undlihdl.cxx	\
         uniref.cxx		\
         weighhdl.cxx	\
-        xmlastpl.cxx	\
         xmlaustp.cxx	\
         xmlbahdl.cxx	\
-        xmlexpit.cxx	\
         xmlexppr.cxx	\
-        xmlimpit.cxx	\
         xmlimppr.cxx	\
-        xmlitem.cxx		\
-        xmlitmpr.cxx	\
         xmlnume.cxx		\
         xmlnumfe.cxx	\
         xmlnumfi.cxx	\
@@ -201,15 +196,10 @@ SLOFILES =	\
         $(SLO)$/undlihdl.obj	\
         $(SLO)$/uniref.obj		\
         $(SLO)$/weighhdl.obj	\
-        $(SLO)$/xmlastpl.obj	\
         $(SLO)$/xmlaustp.obj	\
         $(SLO)$/xmlbahdl.obj	\
-        $(SLO)$/xmlexpit.obj	\
         $(SLO)$/xmlexppr.obj	\
-        $(SLO)$/xmlimpit.obj	\
         $(SLO)$/xmlimppr.obj	\
-        $(SLO)$/xmlitem.obj		\
-        $(SLO)$/xmlitmpr.obj	\
         $(SLO)$/xmlnume.obj		\
         $(SLO)$/xmlnumfe.obj	\
         $(SLO)$/xmlnumfi.obj	\
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index ac66038615f1..301b7cd5f177 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlexppr.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:18 $
+ *  last change: $Author: mib $ $Date: 2001-07-04 13:52:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,9 +109,6 @@
 #include "xmlnmspe.hxx"
 #endif
 
-#ifndef _XMLOFF_XMLCNITM_HXX
-#include "xmlcnitm.hxx"
-#endif
 #ifndef _XMLOFF_PROPERTYSETMAPPER_HXX
 #include "xmlprmap.hxx"
 #endif
@@ -424,7 +421,7 @@ void FilterPropertiesInfo_Impl::AddProperty(
 
 const uno::Sequence<OUString>& FilterPropertiesInfo_Impl::GetApiNames()
 {
-    DBG_ASSERT(nCount == aPropInfos.size(), "wrong property count");
+    OSL_ENSURE(nCount == aPropInfos.size(), "wrong property count");
     if( !pApiNames )
     {
         pApiNames = new Sequence < OUString >( nCount );
@@ -906,7 +903,7 @@ void SvXMLExportPropertyMapper::handleSpecialItem(
         const ::std::vector< XMLPropertyState > *pProperties,
         sal_uInt32 nIdx ) const
 {
-    DBG_ASSERT( mxNextMapper.is(), "special item not handled in xml export" );
+    OSL_ENSURE( mxNextMapper.is(), "special item not handled in xml export" );
     if( mxNextMapper.is() )
         mxNextMapper->handleSpecialItem( rAttrList, rProperty, rUnitConverter,
                                         rNamespaceMap, pProperties, nIdx );
@@ -923,7 +920,7 @@ void SvXMLExportPropertyMapper::handleElementItem(
         const ::std::vector< XMLPropertyState > *pProperties,
         sal_uInt32 nIdx ) const
 {
-    DBG_ASSERT( mxNextMapper.is(), "element item not handled in xml export" );
+    OSL_ENSURE( mxNextMapper.is(), "element item not handled in xml export" );
     if( mxNextMapper.is() )
         mxNextMapper->handleElementItem( rHandler, rProperty, rUnitConverter,
                                            rNamespaceMap, nFlags, pProperties,
@@ -1092,7 +1089,7 @@ void SvXMLExportPropertyMapper::exportElementItems(
     {
         const sal_uInt16 nElement = rIndexArray.GetObject( nIndex );
 
-        DBG_ASSERT( 0 != ( maPropMapper->GetEntryFlags(
+        OSL_ENSURE( 0 != ( maPropMapper->GetEntryFlags(
                 rProperties[nElement].mnIndex ) & MID_FLAG_ELEMENT_ITEM_EXPORT),
                 "wrong mid flag!" );
 
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 5a47124208c0..3e98e01287db 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlimppr.cxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:18 $
+ *  last change: $Author: mib $ $Date: 2001-07-04 13:52:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,9 +77,6 @@
 #ifndef _XMLOFF_NMSPMAP_HXX
 #include "nmspmap.hxx"
 #endif
-#ifndef _XMLOFF_XMLCNITM_HXX
-#include "xmlcnitm.hxx"
-#endif
 
 #ifndef _XMLOFF_XMLIMPPR_HXX
 #include "xmlimppr.hxx"
@@ -322,7 +319,7 @@ BOOL SvXMLImportPropertyMapper::handleSpecialItem(
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap ) const
 {
-    DBG_ASSERT( mxNextMapper.is(), "unsuported special item in xml import" );
+    OSL_ENSURE( mxNextMapper.is(), "unsuported special item in xml import" );
     if( mxNextMapper.is() )
         return mxNextMapper->handleSpecialItem( rProperty, rProperties, rValue,
                                                rUnitConverter, rNamespaceMap );
@@ -364,8 +361,8 @@ sal_Bool SvXMLImportPropertyMapper::_FillPropertySet(
     const UniReference<XMLPropertySetMapper> & rPropMapper,
     struct _ContextID_Index_Pair* pSpecialContextIds )
 {
-    DBG_ASSERT( rPropSet.is(), "need an XPropertySet" );
-    DBG_ASSERT( rPropSetInfo.is(), "need an XPropertySetInfo" );
+    OSL_ENSURE( rPropSet.is(), "need an XPropertySet" );
+    OSL_ENSURE( rPropSetInfo.is(), "need an XPropertySetInfo" );
 
     // preliminaries
     sal_Bool bSet = sal_False;
@@ -401,7 +398,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillPropertySet(
                 aError += ByteString( String( rPropName),
                                       RTL_TEXTENCODING_ASCII_US );
                 aError += ByteString("'; style may not be imported correctly.");
-                DBG_ERROR( aError.GetBuffer() );
+                OSL_ENSURE( bSet, aError.GetBuffer() );
 #endif
             }
         }
@@ -452,8 +449,8 @@ sal_Bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
     const UniReference<XMLPropertySetMapper> & rPropMapper,
     struct _ContextID_Index_Pair* pSpecialContextIds )
 {
-    DBG_ASSERT( rMultiPropSet.is(), "Need multi property set. ");
-    DBG_ASSERT( rPropSetInfo.is(), "Need property set info." );
+    OSL_ENSURE( rMultiPropSet.is(), "Need multi property set. ");
+    OSL_ENSURE( rPropSetInfo.is(), "Need property set info." );
 
     sal_Bool bSuccessful = sal_False;
     sal_Int32 nCount = rProperties.size();
@@ -536,7 +533,7 @@ sal_Bool SvXMLImportPropertyMapper::_FillMultiPropertySet(
     }
     catch ( ... )
     {
-        DBG_ERROR("Exception caught; style may not be imported correctly.");
+        OSL_ENSURE(bSuccessful, "Exception caught; style may not be imported correctly.");
     }
 
     return bSuccessful;
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 9d8132c9fc23..1a7009f88594 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlstyle.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:18 $
+ *  last change: $Author: mib $ $Date: 2001-07-04 13:52:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,9 +116,6 @@
 #include "xmltoken.hxx"
 #endif
 
-#ifndef _XMLOFF_XMLITEM_HXX
-#include "xmlitem.hxx"
-#endif
 #ifndef _XMLOFF_FAMILIES_HXX
 #include "families.hxx"
 #endif
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index 4665106c9b86..b001e6b9413a 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmltabe.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:18 $
+ *  last change: $Author: mib $ $Date: 2001-07-04 13:52:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,9 +87,6 @@
 #ifndef _XMLOFF_XMLUCONV_HXX
 #include "xmluconv.hxx"
 #endif
-#ifndef _XMLOFF_XMLEXPIT_HXX
-#include "xmlexpit.hxx"
-#endif
 
 #ifndef _XMLOFF_XMLTABE_HXX
 #include "xmltabe.hxx"