INTEGRATION: CWS impresstables2 (1.57.30); FILE MERGED

2008/02/29 16:03:34 cl 1.57.30.6: #i68103# fixed problem with presentation calc shape
2007/10/11 21:31:49 cl 1.57.30.5: RESYNC: (1.61-1.63); FILE MERGED
2007/08/01 14:12:38 cl 1.57.30.4: RESYNC: (1.59-1.61); FILE MERGED
2007/07/27 09:09:51 cl 1.57.30.3: fixed build issues due to pch and namespace ::rtl
2007/05/07 17:00:11 cl 1.57.30.2: RESYNC: (1.57-1.59); FILE MERGED
2007/04/18 14:51:17 cl 1.57.30.1: #i68103# draft code for table shape import and export

xmloff/source/draw/shapeexport2.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: shapeexport2.cxx,v $
  *
- *  $Revision: 1.63 $
+ *  $Revision: 1.64 $
  *
- *  last change: $Author: hr $ $Date: 2007-08-03 12:54:17 $
+ *  last change: $Author: rt $ $Date: 2008-03-12 10:35:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -142,7 +142,9 @@
 #include <basegfx/tuple/b2dtuple.hxx>
 #endif
 
-using namespace ::rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
@@ -1335,15 +1337,6 @@ void XMLShapeExport::ImpExportChartShape(
 
 //////////////////////////////////////////////////////////////////////////////
 
-void XMLShapeExport::ImpExportSpreadsheetShape(
-    const uno::Reference< drawing::XShape >& xShape,
-    XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
-{
-    ImpExportOLE2Shape( xShape, eShapeType, nFeatures, pRefPoint );
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
 void XMLShapeExport::ImpExportControlShape(
     const uno::Reference< drawing::XShape >& xShape,
     XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
@@ -1668,7 +1661,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
             bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_OBJECT) );
         else if(eShapeType == XmlShapeTypePresChartShape)
             bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_CHART) );
-        else if(eShapeType == XmlShapeTypePresTableShape)
+        else if(eShapeType == XmlShapeTypePresSheetShape)
             bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) );
 
         sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#