framework/inc/services/layoutmanager.hxx | 12 - framework/source/layoutmanager/layoutmanager.cxx | 14 - offapi/UnoApi_offapi.mk | 1 offapi/com/sun/star/frame/LayoutManager.idl | 7 offapi/com/sun/star/frame/XInplaceLayout.idl | 68 --------- oox/Library_oox.mk | 1 oox/Package_inc.mk | 1 oox/inc/oox/core/binaryfilterbase.hxx | 65 --------- oox/inc/oox/core/filterbase.hxx | 17 -- oox/source/core/binaryfilterbase.cxx | 72 ---------- oox/source/core/filterbase.cxx | 13 - qadevOOo/Jar_OOoRunner.mk | 1 qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv | 2 qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java | 48 ------ sc/source/filter/inc/excelfilter.hxx | 1 sc/source/filter/inc/workbookhelper.hxx | 1 sc/source/filter/oox/workbookhelper.cxx | 5 sd/source/filter/ppt/pptin.cxx | 2 unusedcode.easy | 3 19 files changed, 3 insertions(+), 331 deletions(-)
New commits: commit 032439617e4c82980d909dd09e10a47471d70aec Author: Thomas Arnhold <tho...@arnhold.org> Date: Thu Apr 12 11:15:14 2012 +0200 unusedcode.easy: remove FilterBase::openSubStorage diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx index 709b386..a4607e2 100644 --- a/oox/inc/oox/core/filterbase.hxx +++ b/oox/inc/oox/core/filterbase.hxx @@ -161,18 +161,6 @@ public: /** Returns the base storage of the imported/exported file. */ StorageRef getStorage() const; - /** Opens and returns the specified sub storage from the base storage. - - @param rStorageName - The name of the embedded storage. The name may contain slashes to - open storages from embedded substorages. - @param bCreateMissing - True = create missing sub storages (for export filters). - */ - StorageRef openSubStorage( - const ::rtl::OUString& rStorageName, - bool bCreateMissing ) const; - /** Opens and returns the specified input stream from the base storage. @param rStreamName diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index ce4fe3d..97f298d 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -363,11 +363,6 @@ StorageRef FilterBase::getStorage() const return mxImpl->mxStorage; } -StorageRef FilterBase::openSubStorage( const OUString& rStorageName, bool bCreateMissing ) const -{ - return mxImpl->mxStorage->openSubStorage( rStorageName, bCreateMissing ); -} - Reference< XInputStream > FilterBase::openInputStream( const OUString& rStreamName ) const { return mxImpl->mxStorage->openInputStream( rStreamName ); diff --git a/unusedcode.easy b/unusedcode.easy index 5b1ce0f..c619945 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -760,7 +760,6 @@ nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&) nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&) oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>) -oox::core::FilterBase::openSubStorage(rtl::OUString const&, bool) const oox::xls::Alignment::setBiff2Data(unsigned char) oox::xls::Alignment::setBiff3Data(unsigned short) oox::xls::Alignment::setBiff4Data(unsigned short) commit 3030a3a52f9bd89a055f65a2c5033be028da3cc2 Author: Thomas Arnhold <tho...@arnhold.org> Date: Thu Apr 12 11:03:22 2012 +0200 offapi: remove obsolete XInplaceLayout (2nd try) This is related to 10e580c57b907420e8c6d816325445a40a720e4a diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index e9eea8d..09be601 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -67,7 +67,6 @@ #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> -#include <com/sun/star/frame/XInplaceLayout.hpp> #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/awt/XTopWindow2.hpp> #include <com/sun/star/awt/XDockableWindow.hpp> @@ -79,7 +78,7 @@ // other includes //_________________________________________________________________________________________________________________ #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/implbase8.hxx> +#include <cppuhelper/implbase7.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/propertycontainer.hxx> #include <tools/wintypes.hxx> @@ -96,12 +95,11 @@ namespace framework { class InfoHelperBuilder; } - typedef ::cppu::WeakImplHelper8 < ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakImplHelper7 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::frame::XLayoutManager , ::com::sun::star::awt::XWindowListener , ::com::sun::star::frame::XFrameActionListener , ::com::sun::star::ui::XUIConfigurationListener - , ::com::sun::star::frame::XInplaceLayout , ::com::sun::star::frame::XMenuBarMergingAcceptor , ::com::sun::star::frame::XLayoutManagerEventBroadcaster > LayoutManager_Base; @@ -161,12 +159,6 @@ namespace framework virtual sal_Bool SAL_CALL isVisible() throw (::com::sun::star::uno::RuntimeException); //--------------------------------------------------------------------------------------------------------- - // XInplaceLayout - //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL setInplaceMenuBar( sal_Int64 pInplaceMenuBarPointer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL resetInplaceMenuBar( ) throw (::com::sun::star::uno::RuntimeException); - - //--------------------------------------------------------------------------------------------------------- // XMenuBarMergingAcceptor //--------------------------------------------------------------------------------------------------------- virtual sal_Bool SAL_CALL setMergedMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMergedMenuBar ) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 7d5e6a5..082d242 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - // my own includes #include <services/layoutmanager.hxx> #include <helpers.hxx> @@ -34,7 +33,6 @@ #include <services.h> #include <framework/sfxhelperfunctions.hxx> -#include <framework/sfxhelperfunctions.hxx> #include <uielement/menubarwrapper.hxx> #include <framework/addonsoptions.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> @@ -1248,18 +1246,6 @@ throw (RuntimeException) implts_reset( sal_True ); } -void SAL_CALL LayoutManager::setInplaceMenuBar( sal_Int64 ) -throw (uno::RuntimeException) -{ - OSL_FAIL( "This method is obsolete and should not be used!\n" ); -} - -void SAL_CALL LayoutManager::resetInplaceMenuBar() -throw (uno::RuntimeException) -{ - OSL_FAIL( "This method is obsolete and should not be used!\n" ); -} - //--------------------------------------------------------------------------------------------------------- // XMenuBarMergingAcceptor //--------------------------------------------------------------------------------------------------------- diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index d533eb3..3edb190 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2519,7 +2519,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XFrameSetModel \ XFrames \ XFramesSupplier \ - XInplaceLayout \ XInterceptorInfo \ XLayoutManager \ XLayoutManagerEventBroadcaster \ diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl index aee70e7..9e30376 100644 --- a/offapi/com/sun/star/frame/LayoutManager.idl +++ b/offapi/com/sun/star/frame/LayoutManager.idl @@ -32,7 +32,6 @@ #include <com/sun/star/frame/XLayoutManager.idl> #include <com/sun/star/frame/XFrameActionListener.idl> #include <com/sun/star/ui/XUIConfigurationListener.idl> -#include <com/sun/star/frame/XInplaceLayout.idl> #include <com/sun/star/beans/XPropertySet.idl> #include <com/sun/star/frame/XMenuBarMergingAcceptor.idl> #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.idl> @@ -100,12 +99,6 @@ service LayoutManager */ [optional] interface ::com::sun::star::frame::XLayoutManagerEventBroadcaster; - /** interface to support settings a menu bar for inplace editing of - components inside OpenOffice.org. - - @deprecated - */ - [optional] interface ::com::sun::star::frame::XInplaceLayout; }; }; }; }; }; diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl deleted file mode 100644 index aeeeadd..0000000 --- a/offapi/com/sun/star/frame/XInplaceLayout.idl +++ /dev/null @@ -1,68 +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. - * - ************************************************************************/ - -#ifndef __com_sun_star_frame_XInplaceLayout_idl__ -#define __com_sun_star_frame_XInplaceLayout_idl__ - -#include <com/sun/star/uno/XInterface.idl> - -//============================================================================= - -module com { module sun { module star { module frame { - -//============================================================================= - -/** special interface to support inplace editing of components inside - OpenOffice.org. - - @deprecated - - @since OOo 2.0 -*/ - -interface XInplaceLayout : com::sun::star::uno::XInterface -{ - /** sets an inplace menu to the container window of the attached frame. - - @param InplaceMenuBarPointer - must be a VCL menu bar pointer which is accessible within the - layout manager process. - */ - void setInplaceMenuBar( [in] hyper InplaceMenuBarPointer ); - - /** removes an inplace menu and sets back a previously created menu bar if one - has been set before. - */ - void resetInplaceMenuBar(); -}; - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 0a964a0..9ef3da9 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -558,7 +558,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/frame/_XFrameActionListener \ qadevOOo/tests/java/ifc/frame/_XFrameLoader \ qadevOOo/tests/java/ifc/frame/_XFramesSupplier \ - qadevOOo/tests/java/ifc/frame/_XInplaceLayout \ qadevOOo/tests/java/ifc/frame/_XLayoutManager \ qadevOOo/tests/java/ifc/frame/_XModel \ qadevOOo/tests/java/ifc/frame/_XModuleManager \ diff --git a/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv b/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv index af47fcb..f45c6bc 100644 --- a/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv +++ b/qadevOOo/objdsc/fwk/com.sun.star.comp.framework.LayoutManager.csv @@ -1,6 +1,4 @@ "LayoutManager";"com::sun::star::lang::XEventListener";"disposing()" -"LayoutManager";"com::sun::star::frame::XInplaceLayout#optional";"setInplaceMenuBar()" -"LayoutManager";"com::sun::star::frame::XInplaceLayout#optional";"resetInplaceMenuBar()" "LayoutManager";"com::sun::star::frame::XLayoutManager";"attachFrame()" "LayoutManager";"com::sun::star::frame::XLayoutManager";"reset()" "LayoutManager";"com::sun::star::frame::XLayoutManager";"getCurrentDockingArea()" diff --git a/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java b/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java deleted file mode 100644 index 2d644d2..0000000 --- a/qadevOOo/tests/java/ifc/frame/_XInplaceLayout.java +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * 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. - * - ************************************************************************/ - -package ifc.frame; - -import com.sun.star.frame.XInplaceLayout; -import lib.MultiMethodTest; - -public class _XInplaceLayout extends MultiMethodTest { - public XInplaceLayout oObj = null; - - public void _setInplaceMenuBar() { - log.print("This method exists for inplace editing with own modules. "); - log.println("It makes no sense to call it from Java."); -// oObj.setInplaceMenuBar(l); - tRes.tested("setInplaceMenuBar()", true); - } - - public void _resetInplaceMenuBar() { - requiredMethod("setInplaceMenuBar()"); - oObj.resetInplaceMenuBar(); - tRes.tested("resetInplaceMenuBar()", true); - } -} commit 5bce9624d10e9b22a0764884c88c5951aa6a26fe Author: Thomas Arnhold <tho...@arnhold.org> Date: Wed Apr 11 13:25:29 2012 +0200 fix modeline diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 147813b..0ba0fbc 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. commit ab01a70b7f809f9ac8a1c342244665331751aecd Author: Thomas Arnhold <tho...@arnhold.org> Date: Thu Apr 12 11:01:02 2012 +0200 unusedcode.easy: Remove BinaryFilterBase diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index e6290e5..ce93130 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -84,7 +84,6 @@ $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) $(eval $(call gb_Library_add_exception_objects,oox,\ oox/source/core/binarycodec \ - oox/source/core/binaryfilterbase \ oox/source/core/contexthandler2 \ oox/source/core/contexthandler \ oox/source/core/fastparser \ diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk index c36dbc0..517cc83 100644 --- a/oox/Package_inc.mk +++ b/oox/Package_inc.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/binarycodec.hxx,oox/core/ $(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/contexthandler.hxx,oox/core/contexthandler.hxx)) $(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/contexthandler2.hxx,oox/core/contexthandler2.hxx)) $(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/fragmenthandler.hxx,oox/core/fragmenthandler.hxx)) -$(eval $(call gb_Package_add_file,oox_inc,inc/oox/core/binaryfilterbase.hxx,oox/core/binaryfilterbase.hxx)) $(eval $(call gb_Package_add_file,oox_inc,inc/oox/dllapi.h,oox/dllapi.h)) $(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/chart/chartconverter.hxx,oox/drawingml/chart/chartconverter.hxx)) $(eval $(call gb_Package_add_file,oox_inc,inc/oox/drawingml/table/tablestylelist.hxx,oox/drawingml/table/tablestylelist.hxx)) diff --git a/oox/inc/oox/core/binaryfilterbase.hxx b/oox/inc/oox/core/binaryfilterbase.hxx deleted file mode 100644 index 5664525..0000000 --- a/oox/inc/oox/core/binaryfilterbase.hxx +++ /dev/null @@ -1,65 +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. - * - ************************************************************************/ - -#ifndef OOX_CORE_BINARYFILTERBASE_HXX -#define OOX_CORE_BINARYFILTERBASE_HXX - -#include <rtl/ref.hxx> -#include "oox/core/filterbase.hxx" - -namespace oox { -namespace core { - -// ============================================================================ - -class OOX_DLLPUBLIC BinaryFilterBase : public FilterBase -{ -public: - explicit BinaryFilterBase( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) - throw( ::com::sun::star::uno::RuntimeException ); - - virtual ~BinaryFilterBase(); - -private: - virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const; - virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const; -}; - -typedef ::rtl::Reference< BinaryFilterBase > BinaryFilterRef; - -// ============================================================================ - -} // namespace core -} // namespace oox - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/core/binaryfilterbase.cxx b/oox/source/core/binaryfilterbase.cxx deleted file mode 100644 index e28c6bc..0000000 --- a/oox/source/core/binaryfilterbase.cxx +++ /dev/null @@ -1,72 +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 "oox/core/binaryfilterbase.hxx" - -#include "oox/ole/olestorage.hxx" - -namespace oox { -namespace core { - -// ============================================================================ - -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::io; -using namespace ::com::sun::star::uno; - -using ::rtl::OUString; - -// ============================================================================ - -BinaryFilterBase::BinaryFilterBase( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : - FilterBase( rxContext ) -{ -} - -BinaryFilterBase::~BinaryFilterBase() -{ -} - -// private -------------------------------------------------------------------- - -StorageRef BinaryFilterBase::implCreateStorage( const Reference< XInputStream >& rxInStream ) const -{ - return StorageRef( new ::oox::ole::OleStorage( getComponentContext(), rxInStream, true ) ); -} - -StorageRef BinaryFilterBase::implCreateStorage( const Reference< XStream >& rxOutStream ) const -{ - return StorageRef( new ::oox::ole::OleStorage( getComponentContext(), rxOutStream, true ) ); -} - -// ============================================================================ - -} // namespace core -} // namespace oox - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 483249f..13a876d 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -29,7 +29,6 @@ #ifndef OOX_XLS_EXCELFILTER_HXX #define OOX_XLS_EXCELFILTER_HXX -#include "oox/core/binaryfilterbase.hxx" #include "oox/core/xmlfilterbase.hxx" namespace oox { diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 10a903e..7a52984 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -57,7 +57,6 @@ namespace oox { } namespace oox { namespace core { - class BinaryFilterBase; class FilterBase; class FragmentHandler; class XmlFilterBase; diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 5bdac51..5a872c2 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -91,7 +91,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using ::oox::core::BinaryFilterBase; using ::oox::core::FilterBase; using ::oox::core::FragmentHandler; using ::oox::core::XmlFilterBase; @@ -225,8 +224,6 @@ public: // BIFF2-BIFF8 specific --------------------------------------------------- - /** Returns the base BIFF filter object. */ - inline BinaryFilterBase& getBiffFilter() const { return *mpBiffFilter; } /** Returns the BIFF type in binary filter. */ inline BiffType getBiff() const { return meBiff; } /** Returns the text encoding used to import/export byte strings. */ @@ -301,7 +298,6 @@ private: XmlFilterBase* mpOoxFilter; /// Base OOXML/BIFF12 filter object. // BIFF2-BIFF8 specific - BinaryFilterBase* mpBiffFilter; /// Base BIFF2-BIFF8 filter object. BiffCodecHelperPtr mxCodecHelper; /// Encoder/decoder helper. BiffType meBiff; /// BIFF version for BIFF import/export. rtl_TextEncoding meTextEnc; /// BIFF byte string text encoding. @@ -316,7 +312,6 @@ WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) : mrExcelBase( rFilter ), meFilterType( FILTER_OOXML ), mpOoxFilter( &rFilter ), - mpBiffFilter( 0 ), meBiff( BIFF_UNKNOWN ), mpDoc( NULL ) { diff --git a/unusedcode.easy b/unusedcode.easy index 4b9994b..5b1ce0f 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -760,7 +760,6 @@ nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&) nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&) oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>) -oox::core::BinaryFilterBase::BinaryFilterBase(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) oox::core::FilterBase::openSubStorage(rtl::OUString const&, bool) const oox::xls::Alignment::setBiff2Data(unsigned char) oox::xls::Alignment::setBiff3Data(unsigned short) commit a555fa2fd52b498cbf779d7c8383d39144cb6ab8 Author: Thomas Arnhold <tho...@arnhold.org> Date: Wed Apr 11 13:23:09 2012 +0200 unusedcode.easy: remove FilterBase::requestEncryptionData diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx index 41f49f7..709b386 100644 --- a/oox/inc/oox/core/filterbase.hxx +++ b/oox/inc/oox/core/filterbase.hxx @@ -213,11 +213,6 @@ public: /** Returns the VBA project manager. */ ::oox::ole::VbaProject& getVbaProject() const; - /** Requests the encryption data from the media descriptor or from the user. On - success, the encryption data will be inserted into the media descriptor. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - requestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const; - /** Imports the raw binary data from the specified stream. @return True, if the data could be imported from the stream. */ bool importBinaryData( StreamDataSequence& orDataSeq, const ::rtl::OUString& rStreamName ); diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 2620272..ce4fe3d 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -413,14 +413,6 @@ VbaProject& FilterBase::getVbaProject() const return *mxImpl->mxVbaProject; } -Sequence< NamedValue > FilterBase::requestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const -{ - ::std::vector< OUString > aDefaultPasswords; - aDefaultPasswords.push_back( CREATE_OUSTRING( "VelvetSweatshop" ) ); - return ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( - rVerifier, mxImpl->maMediaDesc, ::comphelper::DocPasswordRequestType_MS, &aDefaultPasswords ); -} - bool FilterBase::importBinaryData( StreamDataSequence& orDataSeq, const OUString& rStreamName ) { OSL_ENSURE( !rStreamName.isEmpty(), "FilterBase::importBinaryData - empty stream name" ); diff --git a/unusedcode.easy b/unusedcode.easy index ec1bfeb..4b9994b 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -762,7 +762,6 @@ nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx:: oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>) oox::core::BinaryFilterBase::BinaryFilterBase(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) oox::core::FilterBase::openSubStorage(rtl::OUString const&, bool) const -oox::core::FilterBase::requestEncryptionData(comphelper::IDocPasswordVerifier&) const oox::xls::Alignment::setBiff2Data(unsigned char) oox::xls::Alignment::setBiff3Data(unsigned short) oox::xls::Alignment::setBiff4Data(unsigned short) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits