CWS-TOOLING: integrate CWS mba30fixes02

13 files changed, 17 insertions, 127 deletions

diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 7e70bd3cd3cd..7c5e4c5c6788 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: elementimport.cxx,v $
- * $Revision: 1.60 $
+ * $Revision: 1.60.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -543,7 +543,10 @@ namespace xmloff
     //---------------------------------------------------------------------
     void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault)
     {
-        Reference< XPropertySetInfo > xPropsInfo = m_xElement->getPropertySetInfo();
+        Reference< XPropertySetInfo > xPropsInfo;
+        if ( m_xElement.is()) {
+            xPropsInfo=m_xElement->getPropertySetInfo();
+        }
         OSL_ENSURE( xPropsInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" );
 
         if ( !xPropsInfo.is() || xPropsInfo->hasPropertyByName( _rPropertyName ) )
diff --git a/xmloff/source/transform/FlatTContext.cxx b/xmloff/source/transform/FlatTContext.cxx
index 9949e664e190..8420c01dc62c 100644
--- a/xmloff/source/transform/FlatTContext.cxx
+++ b/xmloff/source/transform/FlatTContext.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: FlatTContext.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -52,30 +52,12 @@ XMLPersTextContentTContext::XMLPersTextContentTContext(
 XMLPersTextContentTContext::XMLPersTextContentTContext(
         XMLTransformerBase& rImp,
         const OUString& rQName,
-       sal_uInt16 nActionMap ) :
-    XMLPersAttrListTContext( rImp, rQName, nActionMap )
-{
-}
-
-XMLPersTextContentTContext::XMLPersTextContentTContext(
-        XMLTransformerBase& rImp,
-        const OUString& rQName,
         sal_uInt16 nPrefix,
         ::xmloff::token::XMLTokenEnum eToken ) :
     XMLPersAttrListTContext( rImp, rQName, nPrefix, eToken )
 {
 }
 
-XMLPersTextContentTContext::XMLPersTextContentTContext(
-        XMLTransformerBase& rImp,
-        const OUString& rQName,
-        sal_uInt16 nPrefix,
-        ::xmloff::token::XMLTokenEnum eToken,
-       sal_uInt16 nActionMap ) :
-    XMLPersAttrListTContext( rImp, rQName, nPrefix, eToken, nActionMap )
-{
-}
-
 XMLPersTextContentTContext::~XMLPersTextContentTContext()
 {
 }
diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx
index bf049163346c..094862af267e 100644
--- a/xmloff/source/transform/FlatTContext.hxx
+++ b/xmloff/source/transform/FlatTContext.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: FlatTContext.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -48,24 +48,12 @@ public:
     XMLPersTextContentTContext( XMLTransformerBase& rTransformer,
                            const ::rtl::OUString& rQName );
 
-    // attr list/text content persistence + attribute processing
-    XMLPersTextContentTContext( XMLTransformerBase& rTransformer,
-                           const ::rtl::OUString& rQName,
-                              sal_uInt16 nActionMap );
-
     // attr list/text content persistence + renaming
     XMLPersTextContentTContext( XMLTransformerBase& rTransformer,
                            const ::rtl::OUString& rQName,
                               sal_uInt16 nPrefix,
                               ::xmloff::token::XMLTokenEnum eToken );
 
-    // attr list/text content persistence + renaming + attribute processing
-    XMLPersTextContentTContext( XMLTransformerBase& rTransformer,
-                           const ::rtl::OUString& rQName,
-                              sal_uInt16 nPrefix,
-                              ::xmloff::token::XMLTokenEnum eToken,
-                              sal_uInt16 nActionMap );
-
     // A contexts destructor does anything that is required if an element
     // ends. By default, nothing is done.
     // Note that virtual methods cannot be used inside destructors. Use
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index 491f34ac4ac8..7c3e83635dd6 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: MutableAttrList.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -94,21 +94,6 @@ const Sequence< sal_Int8 > & XMLMutableAttributeList::getUnoTunnelId() throw()
     return *pSeq;
 }
 
-XMLMutableAttributeList* XMLMutableAttributeList::getImplementation(
-        Reference< XInterface > xInt ) throw()
-{
-    Reference< XUnoTunnel > xUT( xInt, UNO_QUERY );
-    if( xUT.is() )
-    {
-        return
-            reinterpret_cast<XMLMutableAttributeList*>(
-                sal::static_int_cast<sal_IntPtr>(
-                    xUT->getSomething( XMLMutableAttributeList::getUnoTunnelId())));
-    }
-    else
-        return NULL;
-}
-
 // XUnoTunnel
 sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething(
         const Sequence< sal_Int8 >& rId )
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index 4a373d43938d..5ca53dfaf420 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: MutableAttrList.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -59,7 +59,6 @@ public:
     ~XMLMutableAttributeList();
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    static XMLMutableAttributeList* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw();
 
     // XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 8ae35567a09f..026c7eab0b1a 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: OOo2Oasis.cxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.23.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -2017,17 +2017,6 @@ Sequence< sal_Int8 >  static CreateUnoTunnelId()
     return aSeq;
 }
 
-// XUnoTunnelHelper
-OOo2OasisTransformer* OOo2OasisTransformer::getImplementation( Reference< XInterface > xInt ) throw()
-{
-    Reference< XUnoTunnel > xUT( xInt, UNO_QUERY );
-    if( xUT.is() )
-        return reinterpret_cast< OOo2OasisTransformer* >(
-            xUT->getSomething( OOo2OasisTransformer::getUnoTunnelId() ));
-    else
-        return NULL;
-}
-
 const Sequence< sal_Int8 > & OOo2OasisTransformer::getUnoTunnelId() throw()
 {
     static Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId();
diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx
index 673e3f504390..2e3a03dac3e1 100644
--- a/xmloff/source/transform/OOo2Oasis.hxx
+++ b/xmloff/source/transform/OOo2Oasis.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: OOo2Oasis.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -65,7 +65,6 @@ public:
     virtual ~OOo2OasisTransformer() throw();
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    static OOo2OasisTransformer * getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw();
 
     // XInterface
 
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index aa83a6df6e24..5b3bd8e1e0c0 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Oasis2OOo.cxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.24.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -2028,17 +2028,6 @@ Oasis2OOoTransformer::~Oasis2OOoTransformer() throw()
     return aSeq;
 }
 
-// XUnoTunnelHelper
-Oasis2OOoTransformer* Oasis2OOoTransformer::getImplementation( Reference< XInterface > xInt ) throw()
-{
-    Reference< XUnoTunnel > xUT( xInt, UNO_QUERY );
-    if( xUT.is() )
-        return reinterpret_cast< Oasis2OOoTransformer* >(
-            xUT->getSomething( Oasis2OOoTransformer::getUnoTunnelId() ));
-    else
-        return NULL;
-}
-
 const Sequence< sal_Int8 > & Oasis2OOoTransformer::getUnoTunnelId() throw()
 {
     static Sequence< sal_Int8 > aSeq = ::CreateUnoTunnelId();
diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx
index 4cd0e64c092c..9422de94aa43 100644
--- a/xmloff/source/transform/Oasis2OOo.hxx
+++ b/xmloff/source/transform/Oasis2OOo.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Oasis2OOo.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -58,8 +58,6 @@ public:
     virtual ~Oasis2OOoTransformer() throw();
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-    static Oasis2OOoTransformer * getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw();
-
 
     // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/xmloff/source/transform/ProcAddAttrTContext.cxx b/xmloff/source/transform/ProcAddAttrTContext.cxx
index e3e0e995d524..e77699dc06c8 100644
--- a/xmloff/source/transform/ProcAddAttrTContext.cxx
+++ b/xmloff/source/transform/ProcAddAttrTContext.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ProcAddAttrTContext.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -48,20 +48,6 @@ TYPEINIT1( XMLProcAddAttrTransformerContext, XMLProcAttrTransformerContext);
 XMLProcAddAttrTransformerContext::XMLProcAddAttrTransformerContext(
         XMLTransformerBase& rImp,
         const OUString& rQName,
-        sal_uInt16 nActionMap,
-        sal_uInt16 nAPrefix,
-           ::xmloff::token::XMLTokenEnum eAToken,
-           ::xmloff::token::XMLTokenEnum eVToken ) :
-    XMLProcAttrTransformerContext( rImp, rQName, nActionMap ),
-    m_aAttrQName( rImp.GetNamespaceMap().GetQNameByKey( nAPrefix,
-                                    ::xmloff::token::GetXMLToken( eAToken ) ) ),
-    m_aAttrValue( ::xmloff::token::GetXMLToken( eVToken ) )
-{
-}
-
-XMLProcAddAttrTransformerContext::XMLProcAddAttrTransformerContext(
-        XMLTransformerBase& rImp,
-        const OUString& rQName,
         sal_uInt16 nPrefix,
         ::xmloff::token::XMLTokenEnum eToken,
         sal_uInt16 nActionMap,
diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx
index 83a27170837e..006cccac8725 100644
--- a/xmloff/source/transform/ProcAddAttrTContext.hxx
+++ b/xmloff/source/transform/ProcAddAttrTContext.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ProcAddAttrTContext.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,13 +45,6 @@ public:
 
     XMLProcAddAttrTransformerContext( XMLTransformerBase& rTransformer,
                            const ::rtl::OUString& rQName,
-                              sal_uInt16 nActionMap,
-                              sal_uInt16 nAPrefix,
-                              ::xmloff::token::XMLTokenEnum eAToken,
-                              ::xmloff::token::XMLTokenEnum eVToken );
-
-    XMLProcAddAttrTransformerContext( XMLTransformerBase& rTransformer,
-                           const ::rtl::OUString& rQName,
                               sal_uInt16 nPrefix,
                               ::xmloff::token::XMLTokenEnum eToken,
                               sal_uInt16 nActionMap,
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 1503bc1b33de..12b36274609e 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: TransformerBase.cxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.23.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1482,24 +1482,6 @@ const XMLTransformerContext *XMLTransformerBase::GetAncestorContext(
     return nSize > nPos+2 ? (*m_pContexts)[nSize-(nPos+2)].get() : 0;
 }
 
-bool XMLTransformerBase::isDraw() const
-{
-    Reference< XServiceInfo > xSI( mxModel, UNO_QUERY );
-    return xSI.is() && xSI->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) );
-}
-
-bool XMLTransformerBase::isImpress() const
-{
-    Reference< XServiceInfo > xSI( mxModel, UNO_QUERY );
-    return xSI.is() && xSI->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) );
-}
-
-bool XMLTransformerBase::isCalc() const
-{
-    Reference< XServiceInfo > xSI( mxModel, UNO_QUERY );
-    return xSI.is() && xSI->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ) );
-}
-
 bool XMLTransformerBase::isWriter() const
 {
     Reference< XServiceInfo > xSI( mxModel, UNO_QUERY );
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index faf3d99cc644..909e7ef2733a 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: TransformerBase.hxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -204,9 +204,6 @@ public:
     inline void SetClass( const ::rtl::OUString& r ) { m_aClass = r; }
     inline const ::rtl::OUString& GetClass() const { return m_aClass; }
 
-    bool isDraw() const;
-    bool isImpress() const;
-    bool isCalc() const;
     bool isWriter() const;
 
 };