Commits

Anonymous committed 54a720c

container_controls: reworked VBA project filter services

  • Participants
  • Parent commits 080a052

Comments (0)

Files changed (12)

File oox/inc/oox/ole/simplevbaprojectfilter.hxx

-#ifndef OOX_OLE_SIMPLEVBAPROJFILTER_HXX
-#define OOX_XLS_SIMPLEVBAPROJFILTER_HXX
-
-#include "oox/core/xmlfilterbase.hxx"
-#include "oox/core/binaryfilterbase.hxx"
-namespace oox {
-namespace ole {
-
-class SimpleVBAProjFilter : public ::oox::core::BinaryFilterBase
-{
-    rtl::OUString       msAppName;
-    rtl::OUString       msVBAStorageName;
-public:
-    explicit            SimpleVBAProjFilter(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
-                            const rtl::OUString& rsAppName,
-                            const rtl::OUString& rsVBAStorageName );
-    virtual             ~SimpleVBAProjFilter();
-
-    virtual bool        importDocument() throw();
-    virtual bool        exportDocument() throw();
-};
-
-class SimpleWordVBAProjFilter : public SimpleVBAProjFilter
-{
-public:
-    explicit            SimpleWordVBAProjFilter(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
-private:
-    virtual ::rtl::OUString implGetImplementationName() const;
-};
-}
-}
-#endif

File oox/inc/oox/ole/vbaproject.hxx

 #include <map>
 #include <com/sun/star/uno/XInterface.hpp>
 #include "oox/helper/storagebase.hxx"
-#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
 
 // ============================================================================
 
-class OOX_DLLPUBLIC VbaFilterConfig
+class VbaFilterConfig
 {
 public:
     explicit            VbaFilterConfig(
 
 // ============================================================================
 
-class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig
+class VbaProject : public VbaFilterConfig
 {
 public:
     explicit            VbaProject(

File oox/inc/oox/ole/vbaprojectfilter.hxx

+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef OOX_OLE_VBAPROJECTFILTER_HXX
+#define OOX_OLE_VBAPROJECTFILTER_HXX
+
+#include "oox/core/binaryfilterbase.hxx"
+
+namespace oox {
+namespace ole {
+
+// ============================================================================
+
+class VbaProjectFilterBase : public ::oox::core::BinaryFilterBase
+{
+public:
+    explicit            VbaProjectFilterBase(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory,
+                            const ::rtl::OUString& rAppName,
+                            const ::rtl::OUString& rStorageName );
+
+    virtual bool        importDocument() throw();
+    virtual bool        exportDocument() throw();
+
+private:
+    ::rtl::OUString     maAppName;
+    ::rtl::OUString     maStorageName;
+};
+
+// ============================================================================
+
+class WordVbaProjectFilter : public VbaProjectFilterBase
+{
+public:
+    explicit            WordVbaProjectFilter(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+
+private:
+    virtual ::rtl::OUString implGetImplementationName() const;
+};
+
+// ============================================================================
+
+} // namespace ole
+} // namespace oox
+
+#endif

File oox/inc/oox/xls/excelfilter.hxx

 
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/core/binaryfilterbase.hxx"
-#include "oox/xls/excelvbaproject.hxx"
-#include "oox/ole/simplevbaprojectfilter.hxx"
+#include "oox/ole/vbaprojectfilter.hxx"
 
 namespace oox {
 namespace xls {
     virtual ::rtl::OUString implGetImplementationName() const;
 };
 
-class SimpleExcelVBAProjFilter : public ExcelBiffFilter
+// ============================================================================
+
+class ExcelVbaProjectFilter : public ExcelBiffFilter
 {
 public:
-    explicit            SimpleExcelVBAProjFilter(
+    explicit            ExcelVbaProjectFilter(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory );
+
     virtual bool        importDocument() throw();
 
 private:
-    virtual GraphicHelper* implCreateGraphicHelper() const;
     virtual ::rtl::OUString implGetImplementationName() const;
 };
 

File oox/inc/oox/xls/excelvbaproject.hxx

 #define OOX_XLS_EXCELVBAPROJECT_HXX
 
 #include "oox/ole/vbaproject.hxx"
-#include "oox/dllapi.h"
 
 namespace com { namespace sun { namespace star {
         namespace sheet { class XSpreadsheetDocument; }
 // ============================================================================
 
 /** Special implementation of the VBA project for the Excel filters. */
-class OOX_DLLPUBLIC VbaProject : public ::oox::ole::VbaProject
+class VbaProject : public ::oox::ole::VbaProject
 {
 public:
     explicit            VbaProject(

File oox/prj/d.lst

 mkdir: %_DEST%\inc%_EXT%\oox\drawingml
 mkdir: %_DEST%\inc%_EXT%\oox\drawingml\chart
 mkdir: %_DEST%\inc%_EXT%\oox\drawingml\table
-mkdir: %_DEST%\inc%_EXT%\oox\ole
 mkdir: %_DEST%\inc%_EXT%\oox\vml
-mkdir: %_DEST%\inc%_EXT%\oox\xls
 
 ..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
 ..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib
 ..\inc\oox\core\xmlfilterbase.hxx %_DEST%\inc%_EXT%\oox\core\xmlfilterbase.hxx
 ..\inc\oox\drawingml\chart\chartconverter.hxx %_DEST%\inc%_EXT%\oox\drawingml\chart\chartconverter.hxx
 ..\inc\oox\drawingml\table\tablestylelist.hxx %_DEST%\inc%_EXT%\oox\drawingml\table\tablestylelist.hxx
-..\inc\oox\ole\vbaproject.hxx %_DEST%\inc%_EXT%\oox\ole\vbaproject.hxx
 ..\inc\oox\vml\vmldrawing.hxx %_DEST%\inc%_EXT%\oox\vml\vmldrawing.hxx
 ..\inc\oox\vml\vmlshape.hxx %_DEST%\inc%_EXT%\oox\vml\vmlshape.hxx
-..\inc\oox\xls\excelvbaproject.hxx %_DEST%\inc%_EXT%\oox\xls\excelvbaproject.hxx
 
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
 

File oox/source/core/facreg.cxx

     namespace xls { SERVICE( BiffDetector ); }
     namespace xls { SERVICE( ExcelFilter ); }
     namespace xls { SERVICE( ExcelBiffFilter ); }
-    namespace xls { SERVICE( SimpleExcelVBAProjFilter ); }
-    namespace ole { SERVICE( SimpleWordVBAProjFilter ); }
+    namespace xls { SERVICE( ExcelVbaProjectFilter ); }
+    namespace ole { SERVICE( WordVbaProjectFilter ); }
     namespace shape { SERVICE( ShapeContextHandler ); }
     namespace shape { SERVICE( FastTokenHandlerService ); }
     namespace docprop { SERVICE2( OOXMLDocPropImportImpl ); }
             WRITEINFO( ::oox::xls::BiffDetector );
             WRITEINFO( ::oox::xls::ExcelFilter );
             WRITEINFO( ::oox::xls::ExcelBiffFilter );
-            WRITEINFO( ::oox::xls::SimpleExcelVBAProjFilter );
-            WRITEINFO( ::oox::ole::SimpleWordVBAProjFilter );
+            WRITEINFO( ::oox::xls::ExcelVbaProjectFilter );
+            WRITEINFO( ::oox::ole::WordVbaProjectFilter );
             WRITEINFO( ::oox::shape::ShapeContextHandler );
             WRITEINFO( ::oox::shape::FastTokenHandlerService );
             WRITEINFO( ::oox::docprop::OOXMLDocPropImportImpl );
         else SINGLEFACTORY( ::oox::xls::BiffDetector )
         else SINGLEFACTORY( ::oox::xls::ExcelFilter )
         else SINGLEFACTORY( ::oox::xls::ExcelBiffFilter )
-        else SINGLEFACTORY( ::oox::xls::SimpleExcelVBAProjFilter )
-        else SINGLEFACTORY( ::oox::ole::SimpleWordVBAProjFilter )
+        else SINGLEFACTORY( ::oox::xls::ExcelVbaProjectFilter )
+        else SINGLEFACTORY( ::oox::ole::WordVbaProjectFilter )
         else SINGLEFACTORY( ::oox::shape::ShapeContextHandler)
         else SINGLEFACTORY( ::oox::shape::FastTokenHandlerService)
         else SINGLEFACTORY2( ::oox::docprop::OOXMLDocPropImportImpl )

File oox/source/ole/makefile.mk

 		$(SLO)$/vbainputstream.obj      \
 		$(SLO)$/vbamodule.obj           \
 		$(SLO)$/vbaproject.obj          \
-		$(SLO)$/simplevbaprojectfilter.obj \
+		$(SLO)$/vbaprojectfilter.obj
 
 # --- Targets -------------------------------------------------------
 

File oox/source/ole/simplevbaprojectfilter.cxx

-#include "oox/ole/simplevbaprojectfilter.hxx"
-#include "oox/ole/vbaproject.hxx"
-#include "oox/helper/binaryinputstream.hxx"
-
-using ::rtl::OUString;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::XInterface;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::xml::sax::XFastDocumentHandler;
-using ::oox::core::BinaryFilterBase;
-//using ::oox::core::FragmentHandlerRef;
-using ::oox::core::Relation;
-using ::oox::core::Relations;
-using ::oox::core::XmlFilterBase;
-
-namespace oox {
-namespace ole {
-
-OUString SAL_CALL SimpleWordVBAProjFilter_getImplementationName() throw()
-{
-    return CREATE_OUSTRING( "com.sun.star.comp.ole.SimpleWordVBAProjFilter" );
-}
-
-Sequence< OUString > SAL_CALL SimpleWordVBAProjFilter_getSupportedServiceNames() throw()
-{
-    OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.ole.SimpleWordVBAProjFilter" );
-    Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
-}
-
-Reference< XInterface > SAL_CALL SimpleWordVBAProjFilter_createInstance(
-        const Reference< XMultiServiceFactory >& rxGlobalFactory ) throw( Exception )
-{
-    return static_cast< ::cppu::OWeakObject* >( new SimpleWordVBAProjFilter( rxGlobalFactory ) );
-}
-
-SimpleVBAProjFilter::SimpleVBAProjFilter( const Reference< XMultiServiceFactory >& rxGlobalFactory, const rtl::OUString& rsAppName, const rtl::OUString& rsVBAStorageName ) :
-    BinaryFilterBase( rxGlobalFactory ), msAppName( rsAppName ), msVBAStorageName( rsVBAStorageName )
-{
-}
-
-SimpleVBAProjFilter::~SimpleVBAProjFilter()
-{
-}
-
-bool SimpleVBAProjFilter::importDocument() throw()
-{
-    StorageRef xVbaPrjStrg = openSubStorage( msVBAStorageName, false )    ;
-    if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
-    {
-        VbaProject aVbaProject( getGlobalFactory(), getModel(), msAppName );
-        aVbaProject.importVbaProject( *xVbaPrjStrg, getGraphicHelper() );
-        return true;
-    }
-    return false;
-}
-
-bool SimpleVBAProjFilter::exportDocument() throw()
-{
-    return false;
-}
-
-SimpleWordVBAProjFilter::SimpleWordVBAProjFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxGlobalFactory ) : SimpleVBAProjFilter( rxGlobalFactory, CREATE_OUSTRING( "Writer" ), CREATE_OUSTRING( "Macros" ) )
-{
-}
-
-OUString SimpleWordVBAProjFilter::implGetImplementationName() const
-{
-    return SimpleWordVBAProjFilter_getImplementationName();
-}
-
-} /*namespace ole*/ } /*namespace oox*/

File oox/source/ole/vbaprojectfilter.cxx

+/*************************************************************************
+ *
+ * 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 "oox/ole/vbaprojectfilter.hxx"
+
+#include "oox/ole/vbaproject.hxx"
+
+namespace oox {
+namespace ole {
+
+// ============================================================================
+
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
+VbaProjectFilterBase::VbaProjectFilterBase( const Reference< XMultiServiceFactory >& rxGlobalFactory,
+        const OUString& rAppName, const OUString& rStorageName ) :
+    BinaryFilterBase( rxGlobalFactory ),
+    maAppName( rAppName ),
+    maStorageName( rStorageName )
+{
+}
+
+bool VbaProjectFilterBase::importDocument() throw()
+{
+    StorageRef xVbaPrjStrg = openSubStorage( maStorageName, false );
+    if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
+    {
+        VbaProject aVbaProject( getGlobalFactory(), getModel(), maAppName );
+        aVbaProject.importVbaProject( *xVbaPrjStrg, getGraphicHelper() );
+        return true;
+    }
+    return false;
+}
+
+bool VbaProjectFilterBase::exportDocument() throw()
+{
+    return false;
+}
+
+// ============================================================================
+
+OUString SAL_CALL WordVbaProjectFilter_getImplementationName() throw()
+{
+    return CREATE_OUSTRING( "com.sun.star.comp.oox.WordVbaProjectFilter" );
+}
+
+Sequence< OUString > SAL_CALL WordVbaProjectFilter_getSupportedServiceNames() throw()
+{
+    Sequence< OUString > aSeq( 1 );
+    aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.comp.oox.WordVBAProjectFilter" );
+    return aSeq;
+}
+
+Reference< XInterface > SAL_CALL WordVbaProjectFilter_createInstance(
+        const Reference< XMultiServiceFactory >& rxGlobalFactory ) throw( Exception )
+{
+    return static_cast< ::cppu::OWeakObject* >( new WordVbaProjectFilter( rxGlobalFactory ) );
+}
+
+// ----------------------------------------------------------------------------
+
+WordVbaProjectFilter::WordVbaProjectFilter( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
+    VbaProjectFilterBase( rxGlobalFactory, CREATE_OUSTRING( "Writer" ), CREATE_OUSTRING( "Macros" ) )
+{
+}
+
+OUString WordVbaProjectFilter::implGetImplementationName() const
+{
+    return WordVbaProjectFilter_getImplementationName();
+}
+
+// ============================================================================
+
+} // namespace ole
+} // namespace oox

File oox/source/xls/excelfilter.cxx

  ************************************************************************/
 
 #include "oox/xls/excelfilter.hxx"
+
+#include <com/sun/star/container/XNameContainer.hpp>
+#include "oox/dump/biffdumper.hxx"
+#include "oox/dump/xlsbdumper.hxx"
 #include "oox/helper/binaryinputstream.hxx"
 #include "oox/xls/biffdetector.hxx"
 #include "oox/xls/biffinputstream.hxx"
 #include "oox/xls/excelchartconverter.hxx"
+#include "oox/xls/excelvbaproject.hxx"
 #include "oox/xls/stylesbuffer.hxx"
 #include "oox/xls/themebuffer.hxx"
 #include "oox/xls/workbookfragment.hxx"
-#include "oox/dump/biffdumper.hxx"
-#include "oox/dump/xlsbdumper.hxx"
-#include <com/sun/star/container/XNameContainer.hpp>
 
-using ::rtl::OUString;
-using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::uno::Exception;
-using ::com::sun::star::uno::XInterface;
-using ::com::sun::star::container::XNameContainer;
-using ::com::sun::star::lang::XMultiServiceFactory;
-using ::com::sun::star::xml::sax::XFastDocumentHandler;
+namespace oox {
+namespace xls {
+
+// ============================================================================
+
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::xml::sax;
+using namespace ::com::sun::star::uno;
+
 using ::oox::core::BinaryFilterBase;
 using ::oox::core::FragmentHandlerRef;
 using ::oox::core::Relation;
 using ::oox::core::Relations;
 using ::oox::core::XmlFilterBase;
 using ::oox::drawingml::table::TableStyleListPtr;
-
-namespace oox {
-namespace xls {
+using ::rtl::OUString;
 
 // ============================================================================
 
 
 Sequence< OUString > SAL_CALL ExcelFilter_getSupportedServiceNames() throw()
 {
-    OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilter" );
-    Sequence< OUString > aSeq( &aServiceName, 1 );
+    Sequence< OUString > aSeq( 1 );
+    aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilter" );
     return aSeq;
 }
 
 
 Sequence< OUString > SAL_CALL ExcelBiffFilter_getSupportedServiceNames() throw()
 {
-    OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelBiffFilter" );
-    Sequence< OUString > aSeq( &aServiceName, 1 );
+    Sequence< OUString > aSeq( 1 );
+    aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelBiffFilter" );
     return aSeq;
 }
 
 
 // ============================================================================
 
-OUString SAL_CALL SimpleExcelVBAProjFilter_getImplementationName() throw()
+OUString SAL_CALL ExcelVbaProjectFilter_getImplementationName() throw()
 {
-    return CREATE_OUSTRING( "com.sun.star.comp.xls.SimpleExcelVBAProjFilter" );
+    return CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelVbaProjectFilter" );
 }
 
-Sequence< OUString > SAL_CALL SimpleExcelVBAProjFilter_getSupportedServiceNames() throw()
+Sequence< OUString > SAL_CALL ExcelVbaProjectFilter_getSupportedServiceNames() throw()
 {
-    OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.ole.SimpleExcelVBAProjFilter" );
-    Sequence< OUString > aSeq( &aServiceName, 1 );
+    Sequence< OUString > aSeq( 1 );
+    aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelVBAProjectFilter" );
     return aSeq;
 }
 
-Reference< XInterface > SAL_CALL SimpleExcelVBAProjFilter_createInstance(
+Reference< XInterface > SAL_CALL ExcelVbaProjectFilter_createInstance(
         const Reference< XMultiServiceFactory >& rxGlobalFactory ) throw( Exception )
 {
-    return static_cast< ::cppu::OWeakObject* >( new SimpleExcelVBAProjFilter( rxGlobalFactory ) );
+    return static_cast< ::cppu::OWeakObject* >( new ExcelVbaProjectFilter( rxGlobalFactory ) );
 }
 
-SimpleExcelVBAProjFilter::SimpleExcelVBAProjFilter( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
+// ----------------------------------------------------------------------------
+
+ExcelVbaProjectFilter::ExcelVbaProjectFilter( const Reference< XMultiServiceFactory >& rxGlobalFactory ) :
     ExcelBiffFilter( rxGlobalFactory )
-//, oox::ole::SimpleVBAProjFilter( rxGlobalFactory, CREATE_OUSTRING( "Calc" ), CREATE_OUSTRING( "_VBA_PROJECT_CUR" ) )
 {
 }
 
-bool SimpleExcelVBAProjFilter::importDocument() throw()
+bool ExcelVbaProjectFilter::importDocument() throw()
 {
     bool bRet = false;
 
     // 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 )
+    OSL_ENSURE( eBiff == BIFF8, "ExcelVbaProjectFilter::ExcelVbaProjectFilter - invalid file format" );
+    if( eBiff == BIFF8 )
     {
         Reference< XNameContainer > xOleNameOverrideSink;
         getArgument( CREATE_OUSTRING( "OleNameOverrideInfo" ) ) >>= xOleNameOverrideSink;
             VbaProject aVbaProject( getGlobalFactory(), aHelper.getDocument() );
             aVbaProject.setOleOverridesSink( xOleNameOverrideSink );
             aVbaProject.importVbaProject( *xVbaPrjStrg, getGraphicHelper() );
+            aVbaProject.attachToEvents();
             bRet = true;
         }
     }
     return bRet;
 }
 
-OUString SimpleExcelVBAProjFilter::implGetImplementationName() const
+OUString ExcelVbaProjectFilter::implGetImplementationName() const
 {
-    return SimpleExcelVBAProjFilter_getImplementationName();
-}
-
-GraphicHelper* SimpleExcelVBAProjFilter::implCreateGraphicHelper() const
-{
-    return new ExcelGraphicHelper( getWorkbookData() );
+    return ExcelVbaProjectFilter_getImplementationName();
 }
 
 // ============================================================================

File sc/source/filter/excel/excimp8.cxx

             aArgs[ 0 ] <<= getProcessServiceFactory();
             aArgs[ 1 ] <<= aArgSeq;
 
-            uno::Reference< document::XImporter > xImporter( ScfApiHelper::CreateInstanceWithArgs( CREATE_OUSTRING( "com.sun.star.comp.xls.SimpleExcelVBAProjFilter" ), aArgs ), uno::UNO_QUERY_THROW );
+            uno::Reference< document::XImporter > xImporter( ScfApiHelper::CreateInstanceWithArgs( CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelVBAProjectFilter" ), aArgs ), uno::UNO_QUERY_THROW );
             xImporter->setTargetDocument( xComponent );
 
             MediaDescriptor aMediaDesc;