From 5c1dc778d6ce38d563462a76cdc454ed476cf15b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 22 Dec 2011 10:46:58 +0000 Subject: remove some unused code --- canvas/Library_canvastools.mk | 1 - canvas/Package_inc.mk | 1 - canvas/inc/canvas/prioritybooster.hxx | 69 ------------------ canvas/source/tools/prioritybooster.cxx | 83 ---------------------- chart2/source/controller/main/UndoGuard.cxx | 18 ----- chart2/source/controller/main/UndoGuard.hxx | 13 ---- comphelper/inc/comphelper/eventattachermgr.hxx | 7 -- .../source/eventattachermgr/eventattachermgr.cxx | 12 ---- sc/inc/clipparam.hxx | 13 ---- sc/inc/document.hxx | 1 - sc/source/core/data/clipparam.cxx | 17 ----- sd/source/ui/slideshow/slideshowimpl.cxx | 1 - unusedcode.easy | 8 --- 13 files changed, 244 deletions(-) delete mode 100644 canvas/inc/canvas/prioritybooster.hxx delete mode 100644 canvas/source/tools/prioritybooster.cxx diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index d9adfca70fc8..d0b11a2316f7 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/page \ canvas/source/tools/pagemanager \ canvas/source/tools/parametricpolypolygon \ - canvas/source/tools/prioritybooster \ canvas/source/tools/propertysethelper \ canvas/source/tools/spriteredrawmanager \ canvas/source/tools/surface \ diff --git a/canvas/Package_inc.mk b/canvas/Package_inc.mk index f3892ca98753..500ed443fc29 100644 --- a/canvas/Package_inc.mk +++ b/canvas/Package_inc.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastoolsdllapi.h,canv $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/debug.hxx,canvas/debug.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/elapsedtime.hxx,canvas/elapsedtime.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/parametricpolypolygon.hxx,canvas/parametricpolypolygon.hxx)) -$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/prioritybooster.hxx,canvas/prioritybooster.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/propertysethelper.hxx,canvas/propertysethelper.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/bitmap.hxx,canvas/rendering/bitmap.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icachedprimitive.hxx,canvas/rendering/icachedprimitive.hxx)) diff --git a/canvas/inc/canvas/prioritybooster.hxx b/canvas/inc/canvas/prioritybooster.hxx deleted file mode 100644 index dfa2196d9189..000000000000 --- a/canvas/inc/canvas/prioritybooster.hxx +++ /dev/null @@ -1,69 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_CANVAS_PRIORITYBOOSTER_HXX -#define INCLUDED_CANVAS_PRIORITYBOOSTER_HXX - -#include - -#include -#include - - -namespace canvas -{ - namespace tools - { - struct PriorityBooster_Impl; - - /** Simplistic RAII object, to temporarily boost execution - priority for the current scope. - */ - class PriorityBooster - { - public: - /** Create booster, with given priority delta - - @param nDelta - Difference in execution priority. Positive values - increase prio, negative values decrease prio. - */ - CANVASTOOLS_DLLPUBLIC explicit PriorityBooster( sal_Int32 nDelta ); - CANVASTOOLS_DLLPUBLIC ~PriorityBooster(); - - private: - // also disables copy constructor and assignment operator - const ::std::auto_ptr< PriorityBooster_Impl > mpImpl; - }; - } -} - -#endif /* INCLUDED_CANVAS_PRIORITYBOOSTER_HXX */ -// eof - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/prioritybooster.cxx b/canvas/source/tools/prioritybooster.cxx deleted file mode 100644 index 837ebb80d9c6..000000000000 --- a/canvas/source/tools/prioritybooster.cxx +++ /dev/null @@ -1,83 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - - -#ifdef WNT -# if defined _MSC_VER -# pragma warning(push,1) -# endif - -# include - -# if defined _MSC_VER -# pragma warning(pop) -# endif -#endif - -#include "osl/diagnose.h" -#include "canvas/prioritybooster.hxx" - - -namespace canvas -{ - namespace tools - { - struct PriorityBooster_Impl - { - int mnOldPriority; - }; - - PriorityBooster::PriorityBooster( sal_Int32 nDelta ) : - mpImpl( new PriorityBooster_Impl ) - { -#ifdef WNT - HANDLE aCurrThread = GetCurrentThread(); - mpImpl->mnOldPriority = GetThreadPriority( aCurrThread ); - - if ( 0 == SetThreadPriority( aCurrThread, mpImpl->mnOldPriority + nDelta ) ) - { - OSL_FAIL( "PriorityBooster::PriorityBooster(): Was not able to modify thread priority" ); - } -#else - (void)nDelta; -#endif - } - - PriorityBooster::~PriorityBooster() - { -#ifdef WNT - SetThreadPriority( GetCurrentThread(), - mpImpl->mnOldPriority ); -#endif - } - } // namespace tools - -} // namespace canvas - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 3bcdc9f5c45b..4069b3e1ffa9 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -145,24 +145,6 @@ UndoGuardWithSelection::~UndoGuardWithSelection() rollback(); } -//----------------------------------------------------------------------------- - -UndoContext::UndoContext( const Reference< document::XUndoManager > & i_undoManager, const ::rtl::OUString& i_undoTitle ) - :m_xUndoManager( i_undoManager ) -{ - ENSURE_OR_THROW( m_xUndoManager.is(), "invalid undo manager!" ); - m_xUndoManager->enterUndoContext( i_undoTitle ); -} - -//----------------------------------------------------------------------------- - -UndoContext::~UndoContext() -{ - m_xUndoManager->leaveUndoContext(); -} - -//----------------------------------------------------------------------------- - HiddenUndoContext::HiddenUndoContext( const Reference< document::XUndoManager > & i_undoManager ) :m_xUndoManager( i_undoManager ) { diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx index ccf25048fd92..61e4a47ce81e 100644 --- a/chart2/source/controller/main/UndoGuard.hxx +++ b/chart2/source/controller/main/UndoGuard.hxx @@ -108,19 +108,6 @@ public: virtual ~UndoGuardWithSelection(); }; -class UndoContext -{ -public: - UndoContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager, - const ::rtl::OUString& i_undoTitle - ); - ~UndoContext(); - -private: - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; -}; - class HiddenUndoContext { public: diff --git a/comphelper/inc/comphelper/eventattachermgr.hxx b/comphelper/inc/comphelper/eventattachermgr.hxx index f534ba26dbe5..6d2d7f5bf493 100644 --- a/comphelper/inc/comphelper/eventattachermgr.hxx +++ b/comphelper/inc/comphelper/eventattachermgr.hxx @@ -51,13 +51,6 @@ namespace beans { namespace comphelper { -COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager > -createEventAttacherManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospection > & rIntrospection, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) - throw( ::com::sun::star::uno::Exception ); - - COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager > createEventAttacherManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index ca6372973778..9c119a1f5d5c 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -360,18 +360,6 @@ void SAL_CALL AttacherAllListener_Impl::disposing(const EventObject& ) } -//======================================================================== -//======================================================================== -//======================================================================== - -// Create-Methode fuer EventAttacherManager -Reference< XEventAttacherManager > createEventAttacherManager( const Reference< XIntrospection > & rIntrospection, - const Reference< XMultiServiceFactory > & rSMgr ) - throw( Exception ) -{ - return new ImplEventAttacherManager( rIntrospection, rSMgr ); -} - // Create-Methode fuer EventAttacherManager Reference< XEventAttacherManager > createEventAttacherManager( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ) diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx index f8a4038eaca4..63b4c9aecf53 100644 --- a/sc/inc/clipparam.hxx +++ b/sc/inc/clipparam.hxx @@ -79,19 +79,6 @@ struct ScClipParam void setSourceDocID( sal_uInt32 nVal ) { mnSourceDocID = nVal; } }; -// ============================================================================ - -struct ScClipRangeNameData -{ - ScRangeData::IndexMap maRangeMap; - ::std::vector mpRangeNames; // Don't insert NULL pointers. - bool mbReplace; - - ScClipRangeNameData(); - ~ScClipRangeNameData(); - void insert(sal_uInt16 nOldIndex, sal_uInt16 nNewIndex); -}; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 83ad4a1a6cae..8e41fea45158 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -146,7 +146,6 @@ struct ScLookupCacheMapImpl; class SfxUndoManager; class ScFormulaParserPool; struct ScClipParam; -struct ScClipRangeNameData; class ScRowBreakIterator; struct ScSetStringParam; class ScDocRowHeightUpdater; diff --git a/sc/source/core/data/clipparam.cxx b/sc/source/core/data/clipparam.cxx index b7e44144eb83..65155403f8bb 100644 --- a/sc/source/core/data/clipparam.cxx +++ b/sc/source/core/data/clipparam.cxx @@ -192,21 +192,4 @@ void ScClipParam::transpose() maRanges = aNewRanges; } -// ============================================================================ - -ScClipRangeNameData::ScClipRangeNameData() : - mbReplace(false) -{ -} - -ScClipRangeNameData::~ScClipRangeNameData() -{ -} - -void ScClipRangeNameData::insert(sal_uInt16 nOldIndex, sal_uInt16 nNewIndex) -{ - maRangeMap.insert( - ScRangeData::IndexMap::value_type(nOldIndex, nNewIndex)); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 1da357bfad4c..63eb11d1f673 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -80,7 +80,6 @@ #include "rtl/ref.hxx" #include "slideshow.hrc" #include "canvas/elapsedtime.hxx" -#include "canvas/prioritybooster.hxx" #include "avmedia/mediawindow.hxx" #include "svtools/colrdlg.hxx" diff --git a/unusedcode.easy b/unusedcode.easy index eadbb2fdcc8e..050005ddfd7b 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -298,9 +298,6 @@ ScCellObj::SetFormulaResultDouble(double) ScCellObj::SetFormulaResultString(rtl::OUString const&) ScCellObj::SetFormulaWithGrammar(rtl::OUString const&, rtl::OUString const&, formula::FormulaGrammar::Grammar) ScChangeActionContent::SetNewValue(String const&, ScDocument*) -ScClipRangeNameData::ScClipRangeNameData() -ScClipRangeNameData::insert(unsigned short, unsigned short) -ScClipRangeNameData::~ScClipRangeNameData() ScCompressedArray::GetEntryCount() const ScCompressedArray::CopyFrom(ScCompressedArray const&, int, int, long) ScCompressedArray::GetValue(int) const @@ -1607,8 +1604,6 @@ canvas::ParametricPolyPolygon::ParametricPolyPolygon(com::sun::star::uno::Refere canvas::PropertySetHelper::PropertySetHelper(std::__debug::vector::MapEntry, std::allocator::MapEntry> > const&) canvas::createSurfaceProxyManager(boost::shared_ptr const&) canvas::tools::ElapsedTime::getTimeBase() const -canvas::tools::PriorityBooster::PriorityBooster(int) -canvas::tools::PriorityBooster::~PriorityBooster() canvas::tools::appendToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&) canvas::tools::calcRectToRectTransform(basegfx::B2DHomMatrix&, basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DHomMatrix const&) canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&) @@ -1619,8 +1614,6 @@ canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout chart::EquidistantTickIter::getCurrentIndex() const chart::EquidistantTickIter::getMaxIndex() const chart::EquidistantTickIter::gotoIndex(int) -chart::UndoContext::UndoContext(com::sun::star::uno::Reference const&, rtl::OUString const&) -chart::UndoContext::~UndoContext() cmis::Content::exchangeIdentity(com::sun::star::uno::Reference const&) cmis::Content::queryChildren(std::__debug::list, std::allocator > >&) codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&) @@ -1651,7 +1644,6 @@ comphelper::PropertySetInfo::add(comphelper::PropertyMapEntry*, int) comphelper::ResourceBasedEventLogger::ResourceBasedEventLogger(com::sun::star::uno::Reference const&, rtl::OUString const&, rtl::OUString const&) comphelper::SequenceAsHashMap::getAsConstAnyList(unsigned char) const comphelper::ServiceInfoHelper::concatSequences(com::sun::star::uno::Sequence const&, com::sun::star::uno::Sequence const&) -comphelper::createEventAttacherManager(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&) comphelper::findProperty(com::sun::star::beans::Property&, com::sun::star::uno::Sequence&, rtl::OUString const&) comphelper::string::isalnumAsciiString(rtl::OUString const&) comphelper::string::islowerAsciiString(rtl::OUString const&) -- cgit