diff options
-rw-r--r-- | filter/inc/filter/msfilter/svxmsbas.hxx | 13 | ||||
-rw-r--r-- | filter/source/msfilter/makefile.mk | 1 | ||||
-rw-r--r-- | filter/source/msfilter/svxmsbas.cxx | 106 | ||||
-rw-r--r-- | sfx2/inc/sfx2/unoctitm.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/unoctitm.cxx | 10 | ||||
-rw-r--r-- | svtools/inc/svtools/filterutils.hxx | 1 | ||||
-rw-r--r-- | svtools/source/misc/filterutils.cxx | 5 | ||||
-rw-r--r-- | svx/inc/svx/framelink.hxx | 3 | ||||
-rw-r--r-- | svx/source/dialog/framelink.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/dataaccessdescriptor.cxx | 39 | ||||
-rw-r--r-- | svx/source/form/formcontrolling.cxx | 8 | ||||
-rw-r--r-- | svx/source/inc/formcontrolling.hxx | 6 | ||||
-rw-r--r-- | unusedcode.easy | 5 |
13 files changed, 0 insertions, 204 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: */ diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx index d4391bc59425..2a76da14f7fd 100644 --- a/sfx2/inc/sfx2/unoctitm.hxx +++ b/sfx2/inc/sfx2/unoctitm.hxx @@ -73,7 +73,6 @@ public: const ::com::sun::star::util::URL& GetCommand() const { return aCommand; } - void Execute(); // XStatusListener virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 4c93ccf3fb41..021824698cf3 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -258,16 +258,6 @@ void SfxUnoControllerItem::GetNewDispatch() return xDisp; } -void SfxUnoControllerItem::Execute() -{ - // dispatch the resource - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Referer") ); - aSeq[0].Value <<= ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("private:select") ); - if ( xDispatch.is() ) - xDispatch->dispatch( aCommand, aSeq ); -} - void SfxUnoControllerItem::ReleaseBindings() { // connection to binding is lost; so forget the binding and the dispatch diff --git a/svtools/inc/svtools/filterutils.hxx b/svtools/inc/svtools/filterutils.hxx index ac14f9237958..0676ce968da8 100644 --- a/svtools/inc/svtools/filterutils.hxx +++ b/svtools/inc/svtools/filterutils.hxx @@ -13,7 +13,6 @@ namespace svt public: SVT_DLLPUBLIC static rtl::OUString CreateOUStringFromUniStringArray( const char* pcCharArr, sal_uInt32 nBufSize ); - SVT_DLLPUBLIC static rtl::OUString CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize ); }; //........................................................................ diff --git a/svtools/source/misc/filterutils.cxx b/svtools/source/misc/filterutils.cxx index 06640c55f10e..3f47efb48c2c 100644 --- a/svtools/source/misc/filterutils.cxx +++ b/svtools/source/misc/filterutils.cxx @@ -46,11 +46,6 @@ namespace svt { return lcl_createStringFromArray( pcCharArr, nBufSize, false ); } - - rtl::OUString BinFilterUtils::CreateOUStringFromStringArray( const char* pcCharArr, sal_uInt32 nBufSize ) - { - return lcl_createStringFromArray( pcCharArr, nBufSize, true ); - } //........................................................................ } // namespace svt //........................................................................ diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx index 1d6e7aa2f06f..218ae563ac1c 100644 --- a/svx/inc/svx/framelink.hxx +++ b/svx/inc/svx/framelink.hxx @@ -167,9 +167,6 @@ public: /** Sets whether to use dotted style for single hair lines. */ inline void SetType( editeng::SvxBorderStyle nType ) { mnType = nType; } - /** Scales the style by the specified scaling factor. Ensures that visible lines keep visible. */ - Style& ScaleSelf( double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ); - /** Mirrors this style (exchanges primary and secondary), if it is a double frame style. */ Style& MirrorSelf(); /** Returns this style mirrored, if it is a double frame style, otherwise a simple copy. */ diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index d22b5e98acfd..ca9c5e7586d4 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1241,12 +1241,6 @@ void Style::Set( const SvxBorderLine* pBorder, double fScale, sal_uInt16 nMaxWid } } -Style& Style::ScaleSelf( double fScale, sal_uInt16 nMaxWidth ) -{ - Set( SCALEVALUE( mnPrim ), SCALEVALUE( mnDist ), SCALEVALUE( mnSecn ) ); - return *this; -} - Style& Style::MirrorSelf() { if( mnSecn ) diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 6a97a1d5709a..6cfebb499105 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -75,7 +75,6 @@ namespace svx void invalidateExternRepresentations(); void updateSequence(); - void updateSet(); /** builds the descriptor from a property value sequence @return <TRUE/> @@ -287,44 +286,6 @@ namespace svx m_bSequenceOutOfDate = sal_False; } - //-------------------------------------------------------------------- - void ODADescriptorImpl::updateSet() - { - if (!m_bSetOutOfDate) - return; - - // will be the current values - Sequence< PropertyValue > aValuesToSet(m_aValues.size()); - PropertyValue* pValuesToSet = aValuesToSet.getArray(); - - // build a new property set info - PropertySetInfo* pPropSetInfo = new PropertySetInfo; - - // loop through all our values - for ( DescriptorValues::const_iterator aLoop = m_aValues.begin(); - aLoop != m_aValues.end(); - ++aLoop, ++pValuesToSet - ) - { - PropertyMapEntry* pMapEntry = getPropertyMapEntry( aLoop ); - pPropSetInfo->add( pMapEntry, 1 ); - - *pValuesToSet = buildPropertyValue(aLoop); - } - - // create the generic set - m_xAsSet = GenericPropertySet_CreateInstance( pPropSetInfo ); - - // no we have the set, still need to set the current values - const PropertyValue* pSetValues = aValuesToSet.getConstArray(); - const PropertyValue* pSetValuesEnd = pSetValues + aValuesToSet.getLength(); - for (; pSetValues != pSetValuesEnd; ++pSetValues) - m_xAsSet->setPropertyValue(pSetValues->Name, pSetValues->Value); - - // don't need to rebuild next time - m_bSetOutOfDate = sal_True; - } - //==================================================================== //= ODataAccessDescriptor //==================================================================== diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 50ff9b0a619b..87428ebf5809 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -235,14 +235,6 @@ namespace svx } //-------------------------------------------------------------------- - void ControllerFeatures::assign( const Reference< XForm >& _rxForm ) - { - dispose(); - m_pImpl = new FormControllerHelper( m_aContext, _rxForm, m_pInvalidationCallback ); - m_pImpl->acquire(); - } - - //-------------------------------------------------------------------- ControllerFeatures::~ControllerFeatures() { dispose(); diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index b7db8c61fec4..d2c249f11e8a 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -139,12 +139,6 @@ namespace svx const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController ); - /** assign to a controller - */ - void assign( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm - ); - /// clears the instance so that it cannot be used afterwards void dispose(); diff --git a/unusedcode.easy b/unusedcode.easy index 97ff7e408a47..1f12ff3efd68 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -241,9 +241,6 @@ Graphic::GetGraphicsCompressMode(SvStream&) Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*) Graphic::WriteEmbedded(SvStream&) GraphicConverter::ImplConvert(unsigned long, void*, unsigned long, void**, unsigned long) -GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const -GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const -GraphicHelper::getDeviceInfo() const GraphicReader::IsPreviewModeEnabled() const GroupTable::SkipCurrentGroup() HTMLControls::Insert(HTMLControl const*&, unsigned short&) @@ -1293,7 +1290,6 @@ SvxIMapDlg::GetTargetList() const SvxIconChoiceCtrlEntry::LockPos(unsigned char) SvxIconChoiceCtrlEntry::SetMoved(unsigned char) SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx&, long) -SvxImportMSVBasic::Import(String const&, String const&, unsigned char, unsigned char) SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&) SvxJustifyMethodItem::SvxJustifyMethodItem(unsigned short) SvxLanguageBox::SvxLanguageBox(Window*, long, unsigned char) @@ -1548,7 +1544,6 @@ TempFile::IsValid() const TextObj::TextObj(TextObj&) TextObj::Write(SvStream*) TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&) -TypeName::TypeName(char*, unsigned int, unsigned int, unsigned short, int, int) UCBStorage::IsStorageFile(String const&) UCBStream::UCBStream(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&) UShortCont::Sort() |