diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-04-12 11:01:02 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-04-12 11:39:13 +0200 |
commit | ab01a70b7f809f9ac8a1c342244665331751aecd (patch) | |
tree | 600f66a835dea2cd3faf4486aee26427dc3afec5 | |
parent | a555fa2fd52b498cbf779d7c8383d39144cb6ab8 (diff) |
unusedcode.easy: Remove BinaryFilterBase
-rw-r--r-- | oox/Library_oox.mk | 1 | ||||
-rw-r--r-- | oox/Package_inc.mk | 1 | ||||
-rw-r--r-- | oox/inc/oox/core/binaryfilterbase.hxx | 65 | ||||
-rw-r--r-- | oox/source/core/binaryfilterbase.cxx | 72 | ||||
-rw-r--r-- | sc/source/filter/inc/excelfilter.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/inc/workbookhelper.hxx | 1 | ||||
-rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 5 | ||||
-rwxr-xr-x | unusedcode.easy | 1 |
8 files changed, 0 insertions, 147 deletions
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index e6290e50d473..ce9313071fc5 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 c36dbc0acc3b..517cc83094bd 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 566452582a46..000000000000 --- 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 e28c6bce1551..000000000000 --- 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 483249fccb9c..13a876d98024 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 10a903ecd892..7a529844ed9c 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 5bdac51ea3b4..5a872c2e43c8 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 4b9994b22cde..5b1ce0f8fc21 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) |