callcatcher: regenerate list

17 files changed, 8 insertions, 391 deletions

diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 0731a9f453e8..eeb86193c0e5 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -303,18 +303,10 @@ public:
     void AddAttribute( const rtl::OUString &rAttribute, const rtl::OUString &rValue );
 
     void ChangeLanguageTag( const rtl::OUString &rValue );
-    // Return a ASCII String representation of this object
-    OString ToOString();
 
     // Return a Unicode String representation of this object
     OUString ToOUString();
 
-    bool    Equals(OUString refStr);
-
-    /// returns a attribute
-    XMLAttribute *GetAttribute(
-        const rtl::OUString &rName // the attribute name
-    );
     void SetProject         ( rtl::OString const & prj        ){ project = prj;        }
     void SetFileName        ( rtl::OString const & fn         ){ filename = fn;        }
     void SetId              ( rtl::OString const & theId      ){ id = theId;           }
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 5be1f0e66e21..31a75540130a 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -692,17 +692,6 @@ void XMLElement::ChangeLanguageTag( const rtl::OUString &rValue )
         pCList = NULL;
     }
 }
-/*****************************************************************************/
-XMLAttribute *XMLElement::GetAttribute( const rtl::OUString &rName )
-/*****************************************************************************/
-{
-    if ( pAttributes )
-        for ( size_t i = 0; i < pAttributes->size(); i++ )
-            if ( (*pAttributes)[ i ]->GetName() == rName )
-                return (*pAttributes)[ i ];
-
-    return NULL;
-}
 
 /*****************************************************************************/
 XMLElement::~XMLElement()
@@ -716,25 +705,8 @@ XMLElement::~XMLElement()
         pAttributes = NULL;
     }
 }
-/*****************************************************************************/
-bool    XMLElement::Equals(OUString refStr){
-/*****************************************************************************/
-    return  refStr.equals( ToOUString() );
-}
 
 /*****************************************************************************/
-OString XMLElement::ToOString(){
-/*****************************************************************************/
-    OUString ouEmpty;
-
-    OUStringBuffer* buffer = new OUStringBuffer();
-    Print( this, *buffer , true );
-
-    OString result( (sal_Unicode* )buffer->getStr(), buffer->getLength() , RTL_TEXTENCODING_UTF8 );
-    delete buffer;
-    return result;
-}
-/*****************************************************************************/
 OUString XMLElement::ToOUString(){
 /*****************************************************************************/
     OUStringBuffer* buffer = new OUStringBuffer();
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 2a997efdba44..8f5370f6e944 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -187,7 +187,6 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
         sc/source/filter/oox/formulabase \
         sc/source/filter/oox/formulaparser \
         sc/source/filter/oox/numberformatsbuffer \
-        sc/source/filter/oox/ooxformulaparser \
         sc/source/filter/oox/pagesettings \
         sc/source/filter/oox/pivotcachebuffer \
         sc/source/filter/oox/pivotcachefragment \
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 565a004fd965..290744320888 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -72,69 +72,6 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument
     OSL_ENSURE( pMedStrm, "::ScImportExcel - medium without input stream" );
     if( !pMedStrm ) return eERR_OPEN;           // should not happen
 
-#if OSL_DEBUG_LEVEL > 0
-    using namespace ::com::sun::star;
-    using namespace ::comphelper;
-
-    /*  Environment variable "OOO_OOXBIFFFILTER":
-        - "1" = use new OOX filter for import;
-        - undef/other = use old sc filter for import (OOX only as file dumper). */
-    const sal_Char* pcFileName = ::getenv( "OOO_OOXBIFFFILTER" );
-    bool bUseOoxFilter = pcFileName && (*pcFileName == '1') && (*(pcFileName + 1) == 0);
-    if( SfxObjectShell* pDocShell = pDocument->GetDocumentShell() ) try
-    {
-        uno::Reference< lang::XComponent > xComponent( pDocShell->GetModel(), uno::UNO_QUERY_THROW );
-
-        uno::Sequence< beans::NamedValue > aArgSeq( 1 );
-        aArgSeq[ 0 ].Name = CREATE_OUSTRING( "UseBiffFilter" );
-        aArgSeq[ 0 ].Value <<= bUseOoxFilter;
-
-        uno::Sequence< uno::Any > aArgs( 2 );
-        aArgs[ 0 ] <<= getProcessServiceFactory();
-        aArgs[ 1 ] <<= aArgSeq;
-        uno::Reference< document::XImporter > xImporter( ScfApiHelper::CreateInstanceWithArgs(
-            CREATE_OUSTRING( "com.sun.star.comp.oox.xls.ExcelBiffFilter" ), aArgs ), uno::UNO_QUERY_THROW );
-        xImporter->setTargetDocument( xComponent );
-
-        MediaDescriptor aMediaDesc;
-        SfxItemSet* pItemSet = rMedium.GetItemSet();
-        if( pItemSet )
-        {
-            SFX_ITEMSET_ARG( pItemSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, false);
-            if( pFileNameItem )
-                aMediaDesc[ MediaDescriptor::PROP_URL() ] <<= ::rtl::OUString( pFileNameItem->GetValue() );
-
-            SFX_ITEMSET_ARG( pItemSet, pPasswordItem, SfxStringItem, SID_PASSWORD, false);
-            if( pPasswordItem )
-                aMediaDesc[ MediaDescriptor::PROP_PASSWORD() ] <<= ::rtl::OUString( pPasswordItem->GetValue() );
-
-            SFX_ITEMSET_ARG( pItemSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false);
-            if( pEncryptionDataItem )
-                aMediaDesc[ MediaDescriptor::PROP_ENCRYPTIONDATA() ] = pEncryptionDataItem->GetValue();
-        }
-        aMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ] <<= rMedium.GetInputStream();
-        aMediaDesc[ MediaDescriptor::PROP_INTERACTIONHANDLER() ] <<= rMedium.GetInteractionHandler();
-
-        // call the filter
-        uno::Reference< document::XFilter > xFilter( xImporter, uno::UNO_QUERY_THROW );
-        bool bResult = xFilter->filter( aMediaDesc.getAsConstPropertyValueList() );
-
-        // if filter returns false, document is invalid, or dumper has disabled import -> exit here
-        if( !bResult )
-            return ERRCODE_ABORT;
-
-        // if OOX filter has been used, exit with OK code
-        if( bUseOoxFilter )
-            return eERR_OK;
-    }
-    catch( uno::Exception& )
-    {
-        if( bUseOoxFilter )
-            return ERRCODE_ABORT;
-        // else ignore exception and import the document with this filter
-    }
-#endif
-
     SvStream* pBookStrm = 0;            // The "Book"/"Workbook" stream containing main data.
     XclBiff eBiff = EXC_BIFF_UNKNOWN;   // The BIFF version of the main stream.
 
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index 3b0d5ddbe941..8cbc50bc3ef0 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -129,7 +129,6 @@ struct BinRange
 
     void                read( SequenceInputStream& rStrm );
     void                read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
-    void                write( BiffOutputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ) const;
 };
 
 // ----------------------------------------------------------------------------
@@ -156,12 +155,6 @@ inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinRange& orRange )
     return rStrm;
 }
 
-inline BiffOutputStream& operator<<( BiffOutputStream& rStrm, const BinRange& rRange )
-{
-    rRange.write( rStrm );
-    return rStrm;
-}
-
 // ============================================================================
 
 /** A 2D cell range address list for binary filters. */
diff --git a/sc/source/filter/inc/biffoutputstream.hxx b/sc/source/filter/inc/biffoutputstream.hxx
index 9f9d7d6594ea..543c4a8b31c0 100644
--- a/sc/source/filter/inc/biffoutputstream.hxx
+++ b/sc/source/filter/inc/biffoutputstream.hxx
@@ -82,22 +82,12 @@ private:
     An instance is constructed with a BinaryOutputStream object and the
     maximum size of BIFF record contents (e.g. 2080 bytes in BIFF2-BIFF5, or
     8224 bytes in BIFF8).
-
-    If some data exceeds the record size limit, a CONTINUE record will be
-    started automatically and the new data will be written to this record. If
-    specific data pieces must not be split into the current and a following
-    CONTINUE record, use setPortionSize(). Example: To write a sequence of
-    16-bit values where 4 values form a unit and cannot be split, call
-    setPortionSize(8) first (4*2 bytes == 8).
 */
 class BiffOutputStream : public BinaryOutputStream
 {
 public:
     // record control ---------------------------------------------------------
 
-    /** Sets size of data portion in bytes. 0 or 1 means no portions are used. */
-    void                setPortionSize( sal_uInt8 nSize );
-
     // BinaryOutputStream interface (stream write access) ---------------------
 
     /** Writes the passed data sequence. */
diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx
index 38d702d90542..adad96a871ef 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
@@ -81,25 +81,6 @@ private:
     virtual ::rtl::OUString implGetImplementationName() const;
 };
 
-// ============================================================================
-
-class ExcelBiffFilter : public ::oox::core::BinaryFilterBase, public ExcelFilterBase
-{
-public:
-    explicit            ExcelBiffFilter(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
-                            throw( ::com::sun::star::uno::RuntimeException );
-    virtual             ~ExcelBiffFilter();
-
-    virtual bool        importDocument() throw();
-    virtual bool        exportDocument() throw();
-
-private:
-    virtual GraphicHelper* implCreateGraphicHelper() const;
-    virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
-    virtual ::rtl::OUString implGetImplementationName() const;
-};
-
 } // namespace xls
 } // namespace oox
 
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 4b98cb9baa14..59895e5c25e4 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -1016,9 +1016,6 @@ public:
     /** Imports the STYLE record from the passed stream. */
     void                importStyle( BiffInputStream& rStrm );
 
-    /** Imports a color palette from a UNO sequence in the passed any. */
-    void                importPalette( const ::com::sun::star::uno::Any& rPalette );
-
     /** Final processing after import of all style settings. */
     void                finalizeImport();
 
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index 368abf739c90..89b180e2a47e 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -70,7 +70,6 @@ namespace oox {
 namespace xls {
 
 class ExcelFilter;
-class ExcelBiffFilter;
 
 // ============================================================================
 
@@ -133,7 +132,6 @@ public:
     virtual             ~WorkbookHelper();
 
     static WorkbookGlobalsRef constructGlobals( ExcelFilter& rFilter );
-    static WorkbookGlobalsRef constructGlobals( ExcelBiffFilter& rFilter, BiffType eBiff );
 
     // filter -----------------------------------------------------------------
 
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index d46ff0767f8f..f827600d8045 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -149,18 +149,6 @@ void BinRange::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit )
     maLast.mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8();
 }
 
-void BinRange::write( BiffOutputStream& rStrm, bool bCol16Bit, bool bRow32Bit ) const
-{
-    if( bRow32Bit )
-        rStrm << maFirst.mnRow << maLast.mnRow;
-    else
-        rStrm << static_cast< sal_uInt16 >( maFirst.mnRow ) << static_cast< sal_uInt16 >( maLast.mnRow );
-    if( bCol16Bit )
-        rStrm << static_cast< sal_uInt16 >( maFirst.mnCol ) << static_cast< sal_uInt16 >( maLast.mnCol );
-    else
-        rStrm << static_cast< sal_uInt8 >( maFirst.mnCol ) << static_cast< sal_uInt8 >( maLast.mnCol );
-}
-
 // ============================================================================
 
 void BinRangeList::read( SequenceInputStream& rStrm )
diff --git a/sc/source/filter/oox/biffoutputstream.cxx b/sc/source/filter/oox/biffoutputstream.cxx
index 0af0a2001043..344dd2973db5 100644
--- a/sc/source/filter/oox/biffoutputstream.cxx
+++ b/sc/source/filter/oox/biffoutputstream.cxx
@@ -75,17 +75,6 @@ void BiffOutputRecordBuffer::write( const void* pData, sal_uInt16 nBytes )
 
 } // namespace prv
 
-// ============================================================================
-
-// record control -------------------------------------------------------------
-
-void BiffOutputStream::setPortionSize( sal_uInt8 nSize )
-{
-    OSL_ENSURE( mnPortionPos == 0, "BiffOutputStream::setPortionSize - block operation inside portion" );
-    mnPortionSize = ::std::max< sal_uInt8 >( nSize, 1 );
-    mnPortionPos = 0;
-}
-
 // BinaryOutputStream interface (stream write access) -------------------------
 
 void BiffOutputStream::writeData( const StreamDataSequence& rData, size_t nAtomSize )
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index f5a8b4d19e95..db15a8dbf603 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -205,75 +205,6 @@ OUString ExcelFilter::implGetImplementationName() const
     return ExcelFilter_getImplementationName();
 }
 
-// ============================================================================
-
-OUString SAL_CALL ExcelBiffFilter_getImplementationName() throw()
-{
-    return CREATE_OUSTRING( "com.sun.star.comp.oox.xls.ExcelBiffFilter" );
-}
-
-// ----------------------------------------------------------------------------
-
-ExcelBiffFilter::ExcelBiffFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
-    BinaryFilterBase( rxContext )
-{
-}
-
-ExcelBiffFilter::~ExcelBiffFilter()
-{
-}
-
-bool ExcelBiffFilter::importDocument() throw()
-{
-    /*  To activate the BIFF dumper, insert the full path to the file
-        file:///<path-to-oox-module>/source/dump/biffdumper.ini
-        into the environment variable OOO_BIFFDUMPER and start the office with
-        this variable (nonpro only). */
-    //OOX_DUMP_FILE( ::oox::dump::biff::Dumper );
-
-    /*  The boolean argument "UseBiffFilter" passed through XInitialisation
-        decides whether to import/export the document with this filter (true),
-        or to only use the BIFF file dumper implemented in this filter (false
-        or missing) */
-    Any aUseBiffFilter = getArgument( CREATE_OUSTRING( "UseBiffFilter" ) );
-    bool bUseBiffFilter = false;
-    if( !(aUseBiffFilter >>= bUseBiffFilter) || !bUseBiffFilter )
-        return true;
-
-    // detect BIFF version and workbook stream name
-    OUString aWorkbookName;
-    BiffType eBiff = BiffDetector::detectStorageBiffVersion( aWorkbookName, getStorage() );
-    OSL_ENSURE( eBiff != BIFF_UNKNOWN, "ExcelBiffFilter::ExcelBiffFilter - invalid file format" );
-    if( eBiff == BIFF_UNKNOWN )
-        return false;
-
-    /*  Construct the WorkbookGlobals object referred to by every instance of
-        the class WorkbookHelper, and execute the import filter by constructing
-        an instance of BiffWorkbookFragment and loading the file. */
-    WorkbookGlobalsRef xBookGlob = WorkbookHelper::constructGlobals( *this, eBiff );
-    return xBookGlob.get() && BiffWorkbookFragment( *xBookGlob, aWorkbookName ).importFragment();
-}
-
-bool ExcelBiffFilter::exportDocument() throw()
-{
-    return false;
-}
-
-GraphicHelper* ExcelBiffFilter::implCreateGraphicHelper() const
-{
-    return new ExcelGraphicHelper( getWorkbookGlobals() );
-}
-
-::oox::ole::VbaProject* ExcelBiffFilter::implCreateVbaProject() const
-{
-    return new ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) );
-}
-
-OUString ExcelBiffFilter::implGetImplementationName() const
-{
-    return ExcelBiffFilter_getImplementationName();
-}
-
 } // namespace xls
 } // namespace oox
 
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
deleted file mode 100644
index c0739c5521d3..000000000000
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <boost/shared_ptr.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/sheet/XFilterFormulaParser.hpp>
-#include <cppuhelper/implbase3.hxx>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include "formulaparser.hxx"
-
-namespace oox {
-namespace xls {
-
-// ============================================================================
-
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sheet;
-using namespace ::com::sun::star::table;
-using namespace ::com::sun::star::uno;
-
-using ::rtl::OUString;
-
-// ============================================================================
-
-class OOXMLFormulaParserImpl : private FormulaFinalizer
-{
-public:
-    explicit            OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxModelFactory );
-
-    Sequence< FormulaToken > parseFormula( const OUString& rFormula, const CellAddress& rReferencePos );
-
-protected:
-    virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const;
-
-private:
-    ApiParserWrapper    maApiParser;
-};
-
-// ----------------------------------------------------------------------------
-
-OOXMLFormulaParserImpl::OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxModelFactory ) :
-    FormulaFinalizer( OpCodeProvider( rxModelFactory, FILTER_OOXML, BIFF_UNKNOWN, true ) ),
-    maApiParser( rxModelFactory, *this )
-{
-}
-
-Sequence< FormulaToken > OOXMLFormulaParserImpl::parseFormula( const OUString& rFormula, const CellAddress& rReferencePos )
-{
-    return finalizeTokenArray( maApiParser.parseFormula( rFormula, rReferencePos ) );
-}
-
-const FunctionInfo* OOXMLFormulaParserImpl::resolveBadFuncName( const OUString& rTokenData ) const
-{
-    /*  Try to parse calls to library functions. The format of such a function
-        call is assumed to be
-            "'<path-to-office-install>\Library\<libname>'!<funcname>". */
-
-    // the string has to start with an apostroph (followed by the library URL)
-    if( (rTokenData.getLength() >= 6) && (rTokenData[ 0 ] == '\'') )
-    {
-        // library URL and function name are separated by an exclamation mark
-        sal_Int32 nExclamPos = rTokenData.lastIndexOf( '!' );
-        if( (1 < nExclamPos) && (nExclamPos + 1 < rTokenData.getLength()) && (rTokenData[ nExclamPos - 1 ] == '\'') )
-        {
-            // find the last backslash that separates library path and name
-            sal_Int32 nFileSep = rTokenData.lastIndexOf( '\\', nExclamPos - 2 );
-            if( nFileSep > 1 )
-            {
-                // find preceding backslash that separates the last directory name
-                sal_Int32 nDirSep = rTokenData.lastIndexOf( '\\', nFileSep - 1 );
-                // function library is located in a directory called 'library'
-                if( (nDirSep > 0) && rTokenData.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "\\LIBRARY\\" ), nDirSep ) )
-                {
-                    // try to find a function info for the function name
-                    OUString aFuncName = rTokenData.copy( nExclamPos + 1 ).toAsciiUpperCase();
-                    const FunctionInfo* pFuncInfo = getFuncInfoFromOoxFuncName( aFuncName );
-                    if( pFuncInfo && (pFuncInfo->meFuncLibType != FUNCLIB_UNKNOWN) )
-                    {
-                        // check that the name of the library matches
-                        OUString aLibName = rTokenData.copy( nFileSep + 1, nExclamPos - nFileSep - 2 );
-                        if( pFuncInfo->meFuncLibType == getFuncLibTypeFromLibraryName( aLibName ) )
-                            return pFuncInfo;
-                    }
-                }
-            }
-        }
-    }
-    return 0;
-}
-
-} // namespace xls
-} // namespace oox
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index ffcd6f05cbe7..21bb1e13aee3 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -3231,11 +3231,6 @@ void StylesBuffer::importStyle( BiffInputStream& rStrm )
     maCellStyles.importStyle( rStrm );
 }
 
-void StylesBuffer::importPalette( const Any& rPalette )
-{
-    maPalette.importPalette( rPalette );
-}
-
 void StylesBuffer::finalizeImport()
 {
     // fonts first, are needed to finalize unit converter and XFs below
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index f6ea218a7c87..9760b45b1c82 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -105,7 +105,6 @@ class WorkbookGlobals
 {
 public:
     explicit            WorkbookGlobals( ExcelFilter& rFilter );
-    explicit            WorkbookGlobals( ExcelBiffFilter& rFilter, BiffType eBiff );
                         ~WorkbookGlobals();
 
     /** Returns true, if this helper refers to a valid document. */
@@ -307,19 +306,6 @@ WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) :
     initialize( true );
 }
 
-WorkbookGlobals::WorkbookGlobals( ExcelBiffFilter& rFilter, BiffType eBiff ) :
-    mrBaseFilter( rFilter ),
-    mrExcelBase( rFilter ),
-    meFilterType( FILTER_BIFF ),
-    mpOoxFilter( 0 ),
-    mpBiffFilter( &rFilter ),
-    meBiff( eBiff )
-{
-    // register at the filter, needed for virtual callbacks (even during construction)
-    mrExcelBase.registerWorkbookGlobals( *this );
-    initialize( eBiff >= BIFF5 );
-}
-
 WorkbookGlobals::~WorkbookGlobals()
 {
     finalize();
@@ -650,14 +636,6 @@ WorkbookHelper::~WorkbookHelper()
     return xBookGlob;
 }
 
-/*static*/ WorkbookGlobalsRef WorkbookHelper::constructGlobals( ExcelBiffFilter& rFilter, BiffType eBiff )
-{
-    WorkbookGlobalsRef xBookGlob( new WorkbookGlobals( rFilter, eBiff ) );
-    if( !xBookGlob->isValid() )
-        xBookGlob.reset();
-    return xBookGlob;
-}
-
 // filter ---------------------------------------------------------------------
 
 FilterBase& WorkbookHelper::getBaseFilter() const
diff --git a/svl/qa/unit/test_lngmisc.cxx b/svl/qa/unit/test_lngmisc.cxx
index 8aa9db4ef7b2..86e871beb325 100644
--- a/svl/qa/unit/test_lngmisc.cxx
+++ b/svl/qa/unit/test_lngmisc.cxx
@@ -155,14 +155,14 @@ namespace
 
   void LngMiscTest::testGetThesaurusReplaceText()
   {
-    const static ::rtl::OUString str1(RTL_CONSTASCII_USTRINGPARAM(""));
-    const static ::rtl::OUString str2(RTL_CONSTASCII_USTRINGPARAM("asdf"));
-    const static ::rtl::OUString str3(RTL_CONSTASCII_USTRINGPARAM("asdf (abc)"));
-    const static ::rtl::OUString str4(RTL_CONSTASCII_USTRINGPARAM("asdf*"));
-    const static ::rtl::OUString str5(RTL_CONSTASCII_USTRINGPARAM("asdf * "));
-    const static ::rtl::OUString str6(RTL_CONSTASCII_USTRINGPARAM("asdf (abc) *"));
-    const static ::rtl::OUString str7(RTL_CONSTASCII_USTRINGPARAM("asdf asdf * (abc)"));
-    const static ::rtl::OUString str8(RTL_CONSTASCII_USTRINGPARAM(" * (abc) asdf *"));
+    const ::rtl::OUString str1(RTL_CONSTASCII_USTRINGPARAM(""));
+    const ::rtl::OUString str2(RTL_CONSTASCII_USTRINGPARAM("asdf"));
+    const ::rtl::OUString str3(RTL_CONSTASCII_USTRINGPARAM("asdf (abc)"));
+    const ::rtl::OUString str4(RTL_CONSTASCII_USTRINGPARAM("asdf*"));
+    const ::rtl::OUString str5(RTL_CONSTASCII_USTRINGPARAM("asdf * "));
+    const ::rtl::OUString str6(RTL_CONSTASCII_USTRINGPARAM("asdf (abc) *"));
+    const ::rtl::OUString str7(RTL_CONSTASCII_USTRINGPARAM("asdf asdf * (abc)"));
+    const ::rtl::OUString str8(RTL_CONSTASCII_USTRINGPARAM(" * (abc) asdf *"));
 
     ::rtl::OUString r = linguistic::GetThesaurusReplaceText(str1);
     CPPUNIT_ASSERT(r.isEmpty());
diff --git a/unusedcode.easy b/unusedcode.easy
index 70c2c61356d8..3823d1734d20 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -330,7 +330,6 @@ WPXSubDocument::WPXSubDocument()
 Window::PostUserEvent(unsigned long&, unsigned long, void*)
 X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
 X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-XMLElement::Equals(rtl::OUString)
 XMLFamilyDataList_Impl::GetPos(XMLFamilyData_Impl const*) const
 XMLFamilyDataList_Impl::Remove(XMLFamilyData_Impl*)
 XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const