summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-25 14:35:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-25 14:42:38 +0100
commit37fff5e32a5c918e27b031b2a7ddb97fd9d8b45d (patch)
treeaadb80fe51c8994dd374934e7083b979b7c55059 /filter
parent5b9005677020c1111259bd0adc292a9b838c2995 (diff)
remove newly unused code
Diffstat (limited to 'filter')
-rw-r--r--filter/inc/filter/msfilter/svxmsbas.hxx13
-rw-r--r--filter/source/msfilter/makefile.mk1
-rw-r--r--filter/source/msfilter/svxmsbas.cxx106
3 files changed, 0 insertions, 120 deletions
diff --git a/filter/inc/filter/msfilter/svxmsbas.hxx b/filter/inc/filter/msfilter/svxmsbas.hxx
index f04a83b5111a..ae53f2bd9e84 100644
--- a/filter/inc/filter/msfilter/svxmsbas.hxx
+++ b/filter/inc/filter/msfilter/svxmsbas.hxx
@@ -76,26 +76,13 @@ public:
// check if the MS-VBA-Storage exist in the RootStorage of the DocShell.
// If it exist, then return the WarningId for loosing the information.
static sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS );
- const ControlAttributeInfo& ControlNameForObjectId(){ return m_ModuleNameToObjIdHash; }
static String GetMSBasicStorageName();
- rtl::OUString GetVBAProjectName() { return msProjectName; }
private:
SotStorageRef xRoot;
SfxObjectShell &rDocSh;
sal_Bool bImport;
sal_Bool bCopy;
- ControlAttributeInfo m_ModuleNameToObjIdHash;
- MSFILTER_DLLPRIVATE void extractAttribute( const String& rAttribute, const String& rModName );
-
- MSFILTER_DLLPRIVATE sal_Bool ImportCode_Impl( const String& rStorageName,
- const String &rSubStorageName,
- const std::vector< String >& codeNames,
- sal_Bool bAsComment, sal_Bool bStripped);
- MSFILTER_DLLPRIVATE sal_Bool CopyStorage_Impl( const String& rStorageName,
- const String &rSubStorageName);
- rtl::OUString msProjectName;
- MSFILTER_DLLPRIVATE sal_Bool ImportCode_Impl( VBA_Impl&, const std::vector< String >&, sal_Bool, sal_Bool );
};
#endif
diff --git a/filter/source/msfilter/makefile.mk b/filter/source/msfilter/makefile.mk
index 142e28f0b9ab..89356610b9c0 100644
--- a/filter/source/msfilter/makefile.mk
+++ b/filter/source/msfilter/makefile.mk
@@ -52,7 +52,6 @@ SLOFILES= \
$(SLO)$/msvbahelper.obj \
$(SLO)$/services.obj \
$(SLO)$/svdfppt.obj \
- $(SLO)$/svxmsbas.obj \
$(SLO)$/svxmsbas2.obj \
$(SLO)$/mstoolbar.obj
diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx
deleted file mode 100644
index 58eff1d70d3b..000000000000
--- a/filter/source/msfilter/svxmsbas.cxx
+++ /dev/null
@@ -1,106 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_filter.hxx"
-
-#include <tools/debug.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/app.hxx>
-#include <basic/basmgr.hxx>
-#include <basic/sbmod.hxx>
-#include <svx/svxerr.hxx>
-#include <filter/msfilter/svxmsbas.hxx>
-#include <filter/msfilter/msocximex.hxx>
-#include <sot/storinfo.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
-using namespace com::sun::star::beans;
-using namespace com::sun::star::io;
-using namespace com::sun::star::awt;
-#include <comphelper/storagehelper.hxx>
-
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/script/ModuleInfo.hpp>
-#include <com/sun/star/script/ModuleType.hpp>
-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
-#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
-
-using namespace com::sun::star::container;
-using namespace com::sun::star::script;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star;
-
-using rtl::OUString;
-
-sal_Bool SvxImportMSVBasic::CopyStorage_Impl( const String& rStorageName,
- const String& rSubStorageName)
-{
- sal_Bool bValidStg = sal_False;
- {
- SvStorageRef xVBAStg( xRoot->OpenSotStorage( rStorageName,
- STREAM_READWRITE | STREAM_NOCREATE |
- STREAM_SHARE_DENYALL ));
- if( xVBAStg.Is() && !xVBAStg->GetError() )
- {
- SvStorageRef xVBASubStg( xVBAStg->OpenSotStorage( rSubStorageName,
- STREAM_READWRITE | STREAM_NOCREATE |
- STREAM_SHARE_DENYALL ));
- if( xVBASubStg.Is() && !xVBASubStg->GetError() )
- {
- // then we will copy these storages into the (temporary) storage of the document
- bValidStg = sal_True;
- }
- }
- }
-
- if( bValidStg )
- {
- String aDstStgName( GetMSBasicStorageName() );
- SotStorageRef xDst = SotStorage::OpenOLEStorage( rDocSh.GetStorage(), aDstStgName, STREAM_READWRITE | STREAM_TRUNC );
- SotStorageRef xSrc = xRoot->OpenSotStorage( rStorageName, STREAM_STD_READ );
-
- // TODO/LATER: should we commit the storage?
- xSrc->CopyTo( xDst );
- xDst->Commit();
- ErrCode nError = xDst->GetError();
- if ( nError == ERRCODE_NONE )
- nError = xSrc->GetError();
- if ( nError != ERRCODE_NONE )
- xRoot->SetError( nError );
- else
- bValidStg = sal_True;
- }
-
- return bValidStg;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */