CWS-TOOLING: integrate CWS mba30fixes02

6 files changed, 6 insertions, 74 deletions

diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 748fdd4e2f39..98d601009d22 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xml2utf.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -44,7 +44,6 @@ class Text2UnicodeConverter
 
 public:
     Text2UnicodeConverter( const ::rtl::OString & sEncoding );
-    Text2UnicodeConverter( rtl_TextEncoding encoding );
     ~Text2UnicodeConverter();
 
     ::com::sun::star::uno::Sequence < sal_Unicode > convert( const ::com::sun::star::uno::Sequence<sal_Int8> & );
@@ -69,7 +68,6 @@ private:
 class Unicode2TextConverter
 {
 public:
-    Unicode2TextConverter( const ::rtl::OString & sEncoding );
     Unicode2TextConverter( rtl_TextEncoding encoding );
     ~Unicode2TextConverter();
 
diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx
index 35a4f0919cb3..1ec1128516fd 100644
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ b/sax/source/expatwrap/attrlistimpl.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: attrlistimpl.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -175,35 +175,4 @@ void AttributeList::clear()
     m_pImpl->vecAttribute.clear();
 }
 
-void AttributeList::removeAttribute( const OUString &sName )
-{
-    vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
-
-    for( ; ii != m_pImpl->vecAttribute.end() ; ii ++ ) {
-        if( (*ii).sName == sName ) {
-            m_pImpl->vecAttribute.erase( ii );
-            break;
-        }
-    }
-}
-
-
-void AttributeList::setAttributeList( const Reference<  XAttributeList >  &r )
-{
-    assert( r.is() );
-
-    sal_Int16 nMax = r->getLength();
-    clear();
-    m_pImpl->vecAttribute.reserve( nMax );
-
-    for( int i = 0 ; i < nMax ; i ++ ) {
-       m_pImpl->vecAttribute.push_back(
-           TagAttribute(
-               r->getNameByIndex( static_cast<sal_Int16>(i) ) ,
-               r->getTypeByIndex( static_cast<sal_Int16>(i) ) ,
-               r->getValueByIndex( static_cast<sal_Int16>(i) ) ) );
-    }
-    assert( nMax == getLength() );
-}
-
 }
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index ab811ec429e2..481d9527ffb7 100644
--- a/sax/source/expatwrap/attrlistimpl.hxx
+++ b/sax/source/expatwrap/attrlistimpl.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: attrlistimpl.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -59,10 +59,6 @@ public:
     void addAttribute( const ::rtl::OUString &sName ,
         const ::rtl::OUString &sType , const ::rtl::OUString &sValue );
     void clear();
-    void removeAttribute( const ::rtl::OUString &sName );
-    void setAttributeList( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & );
-
 public:
     // XAttributeList
     virtual sal_Int16 SAL_CALL getLength(void)
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index a021e9d3daa8..d9553113c759 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sax_expat.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -160,7 +160,6 @@ public:
 
     // The implementation details
     static Sequence< OUString >     getSupportedServiceNames_Static(void) throw ();
-    static OUString                 getImplementationName_Static() throw ();
 
 public:
     // The SAX-Parser-Interface
@@ -576,11 +575,6 @@ void SaxExpatParser::setLocale( const Locale & locale ) throw (RuntimeException)
     m_pImpl->locale = locale;
 }
 
-OUString    SaxExpatParser::getImplementationName_Static() throw ()
-{
-    return OUString::createFromAscii( IMPLEMENTATION_NAME );
-}
-
 // XServiceInfo
 OUString SaxExpatParser::getImplementationName() throw ()
 {
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 4d936d895e90..63332684889d 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xml2utf.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -372,12 +372,6 @@ Text2UnicodeConverter::Text2UnicodeConverter( const OString &sEncoding )
     }
 }
 
-Text2UnicodeConverter::Text2UnicodeConverter( rtl_TextEncoding encoding )
-{
-    init( encoding );
-}
-
-
 Text2UnicodeConverter::~Text2UnicodeConverter()
 {
     if( m_bInitialized )
@@ -470,19 +464,6 @@ Sequence<sal_Unicode> Text2UnicodeConverter::convert( const Sequence<sal_Int8> &
 // Unicode2TextConverter
 //
 //----------------------------------------------
-Unicode2TextConverter::Unicode2TextConverter( const OString &sEncoding )
-{
-    rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( sEncoding.getStr() );
-    if( RTL_TEXTENCODING_DONTKNOW == encoding ) {
-        m_bCanContinue = sal_False;
-        m_bInitialized = sal_False;
-    }
-    else {
-        init( encoding );
-    }
-
-}
-
 Unicode2TextConverter::Unicode2TextConverter( rtl_TextEncoding encoding )
 {
     init( encoding );
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 04bf75201497..8cf48649c8e4 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fastparser.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.4.10.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -161,7 +161,6 @@ public:
 
     // The implementation details
     static Sequence< OUString >     getSupportedServiceNames_Static(void);
-    static OUString                 getImplementationName_Static();
 
     // XFastParser
     virtual void SAL_CALL parseStream( const InputSource& aInputSource ) throw (SAXException, IOException, RuntimeException);
@@ -671,11 +670,6 @@ void FastSaxParser::setLocale( const Locale & Locale ) throw (RuntimeException)
     maLocale = Locale;
 }
 
-OUString FastSaxParser::getImplementationName_Static()
-{
-    return OUString::createFromAscii( IMPLEMENTATION_NAME );
-}
-
 // XServiceInfo
 OUString FastSaxParser::getImplementationName() throw (RuntimeException)
 {