#100000# '#if SUPD' conditions removed in preparation of SRC680.

10 files changed, 28 insertions, 90 deletions

diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
index 87f6d5502e66..3da4cd43b461 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SchXMLAutoStylePoolP.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: bm $ $Date: 2002-01-08 17:13:55 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,26 +89,17 @@ SchXMLAutoStylePoolP::~SchXMLAutoStylePoolP()
 {}
 
 void SchXMLAutoStylePoolP::exportStyleAttributes(
-#if SUPD < 650
     SvXMLAttributeList& rAttrList,
-#endif
     sal_Int32 nFamily,
     const ::std::vector< XMLPropertyState >& rProperties,
     const SvXMLExportPropertyMapper& rPropExp
-#if SUPD < 650
     , const SvXMLUnitConverter& rUnitConverter,
     const SvXMLNamespaceMap& rNamespaceMap
-#endif
     ) const
 {
     const rtl::OUString sCDATA( GetXMLToken( XML_CDATA ));
-#if SUPD < 650
     SvXMLAutoStylePoolP::exportStyleAttributes( rAttrList, nFamily, rProperties,
                                                 rPropExp, rUnitConverter, rNamespaceMap );
-#else
-    SvXMLAutoStylePoolP::exportStyleAttributes( nFamily,
-                                                rProperties, rPropExp );
-#endif
 
     if( nFamily == XML_STYLE_FAMILY_SCH_CHART_ID )
     {
diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
index 9ea93cceaa74..99a65b55bd5d 100644
--- a/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
+++ b/xmloff/source/chart/SchXMLAutoStylePoolP.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SchXMLAutoStylePoolP.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:02 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,16 +73,12 @@ protected:
     SchXMLExport& mrSchXMLExport;
 
     virtual void exportStyleAttributes(
-#if SUPD < 650
         SvXMLAttributeList& rAttrList,
-#endif
         sal_Int32 nFamily,
         const ::std::vector< XMLPropertyState >& rProperties,
         const SvXMLExportPropertyMapper& rPropExp
-#if SUPD < 650
         , const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap
-#endif
         ) const;
 
 public:
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index a0c72481bd5f..5f4b01a32765 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SchXMLExport.cxx,v $
  *
- *  $Revision: 1.69 $
+ *  $Revision: 1.70 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-27 18:20:08 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -267,11 +267,9 @@ void SchXMLExportHelper::exportAutoStyles()
         // export chart auto styles
         mrAutoStylePool.exportXML(
             XML_STYLE_FAMILY_SCH_CHART_ID
-#if SUPD < 650
             , mrExport.GetDocHandler(),
             mrExport.GetMM100UnitConverter(),
             mrExport.GetNamespaceMap()
-#endif
             );
 
         // export auto styles for additional shapes
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 3b596cb9320e..82dfeda5687d 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxmlexp.cxx,v $
  *
- *  $Revision: 1.84 $
+ *  $Revision: 1.85 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-27 18:20:15 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2166,11 +2166,9 @@ void SdXMLExport::_ExportAutoStyles()
     // export draw-page styles
     GetAutoStylePool()->exportXML(
         XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID
-#if SUPD < 650
         , GetDocHandler(),
         GetMM100UnitConverter(),
         GetNamespaceMap()
-#endif
         );
 
     if( getExportFlags() & EXPORT_STYLES )
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 50c97ca01a1a..d1e2c105face 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shapeexport.cxx,v $
  *
- *  $Revision: 1.56 $
+ *  $Revision: 1.57 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-27 18:20:16 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -873,11 +873,9 @@ void XMLShapeExport::exportAutoStyles()
     {
         GetExport().GetAutoStylePool()->exportXML(
             XML_STYLE_FAMILY_SD_GRAPHICS_ID
-#if SUPD < 650
             , GetExport().GetDocHandler(),
             GetExport().GetMM100UnitConverter(),
             GetExport().GetNamespaceMap()
-#endif
             );
     }
 
@@ -886,11 +884,9 @@ void XMLShapeExport::exportAutoStyles()
     {
         GetExport().GetAutoStylePool()->exportXML(
             XML_STYLE_FAMILY_SD_PRESENTATION_ID
-#if SUPD < 650
             , GetExport().GetDocHandler(),
             GetExport().GetMM100UnitConverter(),
             GetExport().GetNamespaceMap()
-#endif
             );
     }
 }
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 1d63686c0ce3..37d20095bd05 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLPageExport.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -293,9 +293,7 @@ void XMLPageExport::exportStyles( sal_Bool bUsed, sal_Bool bAutoStyles )
 void XMLPageExport::exportAutoStyles()
 {
     rExport.GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_PAGE_MASTER
-#if SUPD < 650
         , rExport.GetDocHandler(), rExport.GetMM100UnitConverter(),
         rExport.GetNamespaceMap()
-#endif
         );
 }
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 94e66e1a523c..58b2f762f3da 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impastp4.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-27 18:20:34 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -324,11 +324,9 @@ OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) cons
 
 void SvXMLAutoStylePoolP_Impl::exportXML(
            sal_Int32 nFamily,
-#if SUPD < 650
         const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
-#endif
         const SvXMLAutoStylePoolP *pAntiImpl) const
 {
     sal_uInt32 nCount = 0;
@@ -424,16 +422,12 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
                     sName = pFamily->maStrFamilyName;
 
                 pAntiImpl->exportStyleAttributes(
-#if SUPD < 650
                     GetExport().GetAttrList(),
-#endif
                     nFamily,
                     aExpStyles[i].mpProperties->GetProperties(),
                     *pFamily->mxMapper.get()
-#if SUPD < 650
                         , GetExport().GetMM100UnitConverter(),
                         GetExport().GetNamespaceMap()
-#endif
                     );
 
                 SvXMLElementExport aElem( GetExport(),
@@ -466,16 +460,12 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
                     nStart, nEnd, XML_EXPORT_FLAG_IGN_WS );
 
                 pAntiImpl->exportStyleContent(
-#if SUPD < 650
                     GetExport().GetDocHandler(),
-#endif
                     nFamily,
                     aExpStyles[i].mpProperties->GetProperties(),
-                    *pFamily->mxMapper.get()
-#if SUPD < 650
-                    , GetExport().GetMM100UnitConverter(),
+                    *pFamily->mxMapper.get(),
+                    GetExport().GetMM100UnitConverter(),
                     GetExport().GetNamespaceMap()
-#endif
                     );
             }
         }
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 3e376a6489b4..14a6736526dd 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impastpl.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dvo $ $Date: 2001-10-25 20:57:03 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,14 +78,12 @@
 #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
 #include <com/sun/star/uno/Reference.h>
 #endif
-#if SUPD < 650
 #ifndef _COM_SUN_STAR_XML_SAX_XATTRIBUTELIST_HPP_
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #endif
 #ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #endif
-#endif
 
 #ifndef _XMLOFF_PROPMAPPINGTYPES_HXX
 #include <maptype.hxx>
@@ -252,11 +250,9 @@ public:
     ::rtl::OUString FindAndRemoveCached( sal_Int32 nFamily ) const;
 
     void exportXML( sal_Int32 nFamily,
-#if SUPD < 650
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
         const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap,
-#endif
         const SvXMLAutoStylePoolP *pAntiImpl) const;
 
     void ClearEntries();
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index e0eedbe4a570..9e6bec682370 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlaustp.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: fs $ $Date: 2002-10-25 08:05:57 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,16 +127,12 @@ namespace
 }
 
 void SvXMLAutoStylePoolP::exportStyleAttributes(
-#if SUPD < 650
         SvXMLAttributeList& rAttrList,
-#endif
         sal_Int32 nFamily,
         const vector< XMLPropertyState >& rProperties,
-        const SvXMLExportPropertyMapper& rPropExp
-#if SUPD < 650
-        , const SvXMLUnitConverter& rUnitConverter,
+        const SvXMLExportPropertyMapper& rPropExp,
+        const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap
-#endif
         ) const
 {
     if ( XML_STYLE_FAMILY_CONTROL_ID == nFamily )
@@ -247,16 +243,12 @@ void SvXMLAutoStylePoolP::exportStyleAttributes(
 }
 
 void SvXMLAutoStylePoolP::exportStyleContent(
-#if SUPD < 650
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
-#endif
         sal_Int32 nFamily,
         const vector< XMLPropertyState >& rProperties,
-        const SvXMLExportPropertyMapper& rPropExp
-#if SUPD < 650
-        , const SvXMLUnitConverter& rUnitConverter,
+        const SvXMLExportPropertyMapper& rPropExp,
+        const SvXMLUnitConverter& rUnitConverter,
         const SvXMLNamespaceMap& rNamespaceMap
-#endif
         ) const
 {
     if( nFamily == XML_STYLE_FAMILY_PAGE_MASTER )
@@ -339,13 +331,11 @@ void SvXMLAutoStylePoolP::exportStyleContent(
     }
 }
 
-#if SUPD < 650
 SvXMLAutoStylePoolP::SvXMLAutoStylePoolP()
 {
     DBG_ERROR("This constuctor is obsoleted and should not be used!");
     pImpl = NULL;
 }
-#endif
 
 SvXMLAutoStylePoolP::SvXMLAutoStylePoolP( SvXMLExport& rExport )
 {
@@ -463,21 +453,16 @@ OUString SvXMLAutoStylePoolP::FindAndRemoveCached( sal_Int32 nFamily ) const
 }
 
 
-void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily
-
-#if SUPD < 650
-    , const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
+void SvXMLAutoStylePoolP::exportXML( sal_Int32 nFamily,
+    const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler,
     const SvXMLUnitConverter& rUnitConverter,
     const SvXMLNamespaceMap& rNamespaceMap
-#endif
     ) const
 {
     pImpl->exportXML( nFamily,
-#if SUPD < 650
                       GetExport().GetDocHandler(),
                       GetExport().GetMM100UnitConverter(),
                       GetExport().GetNamespaceMap(),
-#endif
                       this);
 }
 
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index f77bb0be37d9..cdd642dc913b 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtparae.cxx,v $
  *
- *  $Revision: 1.107 $
+ *  $Revision: 1.108 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-27 18:20:45 $
+ *  last change: $Author: rt $ $Date: 2003-08-07 12:30:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1054,12 +1054,10 @@ SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateParaExtPropMapper(
     return new XMLTextExportPropertySetMapper( pPropMapper, rExport );
 }
 
-#if SUPD < 650
 void XMLTextParagraphExport::collectFrames()
 {
     collectFrames( sal_False );
 }
-#endif
 
 void XMLTextParagraphExport::collectFrames( sal_Bool bBoundToFrameOnly )
 {
@@ -3005,7 +3003,6 @@ void XMLTextParagraphExport::recordTrackedChangesNoXText()
 
 void XMLTextParagraphExport::exportTextAutoStyles()
 {
-#if SUPD < 650
     GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_PARAGRAPH,
                                    GetExport().GetDocHandler(),
                                    GetExport().GetMM100UnitConverter(),
@@ -3030,13 +3027,6 @@ void XMLTextParagraphExport::exportTextAutoStyles()
                                   GetExport().GetDocHandler(),
                                   GetExport().GetMM100UnitConverter(),
                                   GetExport().GetNamespaceMap() );
-#else
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_PARAGRAPH );
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_TEXT );
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_FRAME );
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_SECTION );
-    GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_RUBY );
-#endif
 
     pListAutoPool->exportXML();
 }