cosv/inc/cosv/tpl/processor.hxx | 48 --------- cosv/inc/cosv/tpl/range.hxx | 185 ------------------------------------- cosv/inc/cosv/tpl/tpltools.hxx | 68 ------------- sc/source/ui/app/scdll.cxx | 1 sc/source/ui/docshell/arealink.cxx | 1 sc/source/ui/docshell/docfunc.cxx | 7 - sc/source/ui/docshell/docsh.cxx | 21 ---- sc/source/ui/docshell/docsh2.cxx | 19 --- sc/source/ui/docshell/docsh3.cxx | 4 sc/source/ui/docshell/docsh4.cxx | 15 --- sc/source/ui/docshell/docsh5.cxx | 7 - sc/source/ui/docshell/docsh6.cxx | 7 - sc/source/ui/docshell/docsh8.cxx | 2 sc/source/ui/docshell/impex.cxx | 18 --- 14 files changed, 2 insertions(+), 401 deletions(-)
New commits: commit b8d065e94aba1dd94ae1bbe33e8ac32c74944e70 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Jul 7 02:44:15 2012 +0200 Remove unused SOT_FORMATSTR_ID_STARCALC_30 Change-Id: I6efa95c07d524379ce1b14c85d897494509039a5 diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index fc3d820..651b46a 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -48,7 +48,6 @@ #include <svtools/parhtml.hxx> #include <sot/formats.hxx> -#define SOT_FORMATSTR_ID_STARCALC_30 SOT_FORMATSTR_ID_STARCALC #include "scitems.hxx" // fuer tbxctrls etc. #include "scmod.hxx" diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 7f82e53..f0f7ff4 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -56,7 +56,6 @@ #include "scabstdlg.hxx" #include <sot/formats.hxx> -#define SOT_FORMATSTR_ID_STARCALC_30 SOT_FORMATSTR_ID_STARCALC #include "cell.hxx" #include "column.hxx" commit 1c8a30d4f9578057d256b18bfb8477839349e9d9 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sun Jul 8 00:34:50 2012 +0200 Remove unused code Change-Id: I00c8f078b50d913c02407653ce23415d31975f2f diff --git a/cosv/inc/cosv/tpl/processor.hxx b/cosv/inc/cosv/tpl/processor.hxx index 833c4e0..a685acd 100644 --- a/cosv/inc/cosv/tpl/processor.hxx +++ b/cosv/inc/cosv/tpl/processor.hxx @@ -56,25 +56,6 @@ class ConstProcessorClient ProcessorIfc & io_processor ) const = 0; }; -/** Implements an acyclic visitor pattern. This is the abstract - base for the classes to be processed (the "visitables"). -*/ -class ProcessorClient -{ - public: - virtual ~ProcessorClient() {} - - void Accept( - ProcessorIfc & io_processor ) - { do_Accept(io_processor); } - private: - virtual void do_Accept( - ProcessorIfc & io_processor ) = 0; -}; - - - - /** Typed base for "visitor" classes, leaving the visited object const. @@ -142,35 +123,6 @@ CheckedCall( ProcessorIfc & io_processor, pProcessor->Process(io_client); } -template <class C> -inline void -AssertedCall( ProcessorIfc & io_processor, - const C & i_client ) -{ - ConstProcessor<C> * - pProcessor = dynamic_cast< csv::ConstProcessor<C> * > - (&io_processor); - csv_assert( pProcessor != 0 - && "csv::AssertedCall() failed. Processed object did not match processor." ); - pProcessor->Process(i_client); -} - -template <class C> -inline void -AssertedCall( ProcessorIfc & io_processor, - C & io_client ) -{ - Processor<C> * - pProcessor = dynamic_cast< csv::Processor<C> * > - (&io_processor); - csv_assert( pProcessor != 0 - && "csv::AssertedCall() failed. Processed object did not match processor." ); - pProcessor->Process(io_client); -} - - - - } // namespace csv #endif diff --git a/cosv/inc/cosv/tpl/range.hxx b/cosv/inc/cosv/tpl/range.hxx deleted file mode 100644 index bb748b3..0000000 --- a/cosv/inc/cosv/tpl/range.hxx +++ /dev/null @@ -1,185 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef CSV_RANGE_HXX -#define CSV_RANGE_HXX - -#include <cstring> // for std::size_t - - - - -namespace csv -{ - - -/** Represents a range of integer or iterator values. - - @tpl T - Has to be assignable, add- and subtractable. That is: - either it is - - an integral type - - or a random access iterator. -*/ -template <class T> -class range -{ - public: - typedef T element_type; /// Provided for generic programming. - typedef range<T> self; - - // LIFECYCLE - range( - T i_inclusiveLowerBorder, - T i_exclusiveUpperBorder ); - ~range(); - // INQUIRY - T begin() const; - T end() const; - std::size_t size() const; - - bool contains( - T i_value ) const; - bool contains( - const self & i_other ) const; - bool overlaps( - const self & i_other ) const; - /// @return i_other.begin() - this->end() - long distance_to( - const self & i_other ) const; - private: - // DATA - T nBegin; - T nEnd; -}; - - -template <class T> -inline range<T> -make_range(T i1, T i2) -{ - return range<T>(i1, i2); -} - -template <class T> -inline range<typename T::const_iterator> -range_of(const T & i_container) -{ - return make_range( i_container.begin(), - i_container.end() - ); -} - -template <class T> -inline range<typename T::iterator> -range_of(T & io_container) -{ - return make_range( io_container.begin(), - io_container.end() - ); -} - - - - - -// IMPLEMENTATION - -template <class T> -range<T>::range( T i_inclusiveLowerBorder, - T i_exclusiveUpperBorder ) - : nBegin(i_inclusiveLowerBorder), - nEnd(i_exclusiveUpperBorder) -{ - csv_assert( nBegin <= nEnd - && "Invalid parameters for range<> constructor."); -} - -template <class T> -range<T>::~range() -{ -} - -template <class T> -inline T -range<T>::begin() const -{ - return nBegin; -} - -template <class T> -inline T -range<T>::end() const -{ - return nEnd; -} - -template <class T> -inline std::size_t -range<T>::size() const -{ - csv_assert( nBegin <= nEnd - && "Invalid range limits in range<>::size()."); - return static_cast<std::size_t>( end() - begin() ); -} - -template <class T> -bool -range<T>::contains(T i_value ) const -{ - return begin() <= i_value - && i_value < end(); -} - -template <class T> -bool -range<T>::contains(const self & i_other) const -{ - // This is subtle, because this would be wrong: - // begin() <= i_other.begin() - // && i_other.end() <= end(); - // An empty range that begins and starts at my end() - // must not be contained. - - return contains(i_other.begin()) - && i_other.end() <= end(); -} - -template <class T> -bool -range<T>::overlaps(const self & i_other) const -{ - return contains(i_other.begin()) - || i_other.contains(begin()); -} - -template <class T> -long -range<T>::distance_to(const self & i_other) const -{ - return i_other.begin() - end(); -} - - - - -} // namespace csv -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cosv/inc/cosv/tpl/tpltools.hxx b/cosv/inc/cosv/tpl/tpltools.hxx index 99a74b1..2d7ebfe 100644 --- a/cosv/inc/cosv/tpl/tpltools.hxx +++ b/cosv/inc/cosv/tpl/tpltools.hxx @@ -34,23 +34,11 @@ template <class COLLECTION> inline void erase_container( COLLECTION & o_rCollection ); -/// Version for std::map -template <class COLLECTION> -void erase_map_of_heap_ptrs( - COLLECTION & o_rCollection ); - /// Version for other containers than std::map, with non-pair value_type. template <class COLLECTION> void erase_container_of_heap_ptrs( COLLECTION & o_rCollection ); -template <class VECTOR_ELEM> -void adjust_vector_size( - std::vector<VECTOR_ELEM> & - io_rVector, - uintt i_nSize, - const VECTOR_ELEM & i_nFill ); - template <class KEY, class VAL> const VAL * find_in_map( /// Usable for all kinds of values @@ -82,13 +70,6 @@ bool contains( const COLLECTION & i_collection, const VALUE & i_value ); -// Object oriented for_each: -template <class COLLECTION, class CLASS, class MEMFUNC> -void call_for_each( - const COLLECTION & i_rList, - CLASS * io_pThis, - MEMFUNC i_fMethod ); - @@ -103,22 +84,6 @@ erase_container( COLLECTION & o_rCollection ) template <class COLLECTION> void -erase_map_of_heap_ptrs( COLLECTION & o_rCollection ) -{ - typename COLLECTION::iterator itEnd = o_rCollection.end(); - for ( typename COLLECTION::iterator it = o_rCollection.begin(); - it != itEnd; - ++it ) - { - delete (*it).second; - } - - o_rCollection.erase( o_rCollection.begin(), - o_rCollection.end() ); -} - -template <class COLLECTION> -void erase_container_of_heap_ptrs( COLLECTION & o_rCollection ) { typename COLLECTION::iterator itEnd = o_rCollection.end(); @@ -133,25 +98,6 @@ erase_container_of_heap_ptrs( COLLECTION & o_rCollection ) o_rCollection.end() ); } -template <class VECTOR_ELEM> -void -adjust_vector_size( std::vector<VECTOR_ELEM> & io_rVector, - uintt i_nSize, - const VECTOR_ELEM & i_nFill ) -{ - if ( io_rVector.size() > i_nSize ) - { - io_rVector.erase( io_rVector.begin() + i_nSize, io_rVector.end() ); - } - else - { - io_rVector.reserve(i_nSize); - while ( io_rVector.size() < i_nSize ) - io_rVector.push_back(i_nFill); - } -} - - template <class KEY, class VAL> const VAL * find_in_map( const std::map< KEY, VAL > & i_rMap, @@ -199,20 +145,6 @@ contains( const COLLECTION & i_collection, i_collection.end(); } -template <class COLLECTION, class CLASS, class MEMFUNC> -void -call_for_each( const COLLECTION & i_rList, - CLASS * io_pThis, - MEMFUNC i_fMethod ) -{ - typename COLLECTION::const_iterator it = i_rList.begin(); - typename COLLECTION::const_iterator itEnd = i_rList.end(); - for ( ; it != itEnd; ++it ) - { - (io_pThis->*i_fMethod)(*it); - } -} - commit 26c3f9d677832826ecccd15951a493742b8e662f Author: Thomas Arnhold <tho...@arnhold.org> Date: Sun Jul 8 00:34:42 2012 +0200 Remove unused include statements Change-Id: I2ff5fcfae2b9b638e0b39450fbedd77b111ec67c diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 1abb653..1e7ac94 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -30,7 +30,6 @@ #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> #include <sfx2/fcontnr.hxx> -#include <sfx2/sfxsids.hrc> #include <sfx2/linkmgr.hxx> #include <svl/stritem.hxx> #include <vcl/msgbox.hxx> diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index bfc6107..40a55de 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -27,29 +27,22 @@ ************************************************************************/ #include "scitems.hxx" -#include <editeng/eeitem.hxx> #include <sfx2/app.hxx> #include <editeng/editobj.hxx> #include <sfx2/linkmgr.hxx> -#include <svx/svdundo.hxx> #include <sfx2/bindings.hxx> -#include <sfx2/printer.hxx> #include <vcl/msgbox.hxx> #include <vcl/sound.hxx> #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> -#include <svl/zforlist.hxx> #include <svl/PasswordHelper.hxx> -#include <basic/sbstar.hxx> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/vba/XVBAModuleInfo.hpp> -#include <list> - #include "docfunc.hxx" #include "sc.hrc" diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 99ff6d7..7f82e53 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -27,40 +27,22 @@ ************************************************************************/ #include "scitems.hxx" -#include <editeng/eeitem.hxx> -#include <editeng/svxenum.hxx> #include <editeng/justifyitem.hxx> -#include <svx/algitem.hxx> - #include <sot/clsids.hxx> -#include <unotools/securityoptions.hxx> -#include <tools/stream.hxx> -#include <tools/string.hxx> -#include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> -#include <svtools/ctrltool.hxx> -#include <svtools/sfxecode.hxx> -#include <svl/zforlist.hxx> #include <svl/PasswordHelper.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dinfdlg.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> -#include <sfx2/evntconf.hxx> -#include <sfx2/sfx.hrc> #include <sfx2/objface.hxx> -#include <svl/srchitem.hxx> -#include <unotools/fltrcfg.hxx> #include <svl/documentlockfile.hxx> #include <svl/sharecontrolfile.hxx> -#include <unotools/charclass.hxx> #include "chgtrack.hxx" #include "chgviset.hxx" -#include <sfx2/request.hxx> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> @@ -71,8 +53,6 @@ #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -#include <basic/sbstar.hxx> -#include <basic/basmgr.hxx> #include "scabstdlg.hxx" #include <sot/formats.hxx> diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 14d0538..5a82e60 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -26,32 +26,13 @@ * ************************************************************************/ -#include <svx/svdpage.hxx> - - -#include <svx/xtable.hxx> - #include "scitems.hxx" -#include <tools/gen.hxx> -#include <svtools/ctrltool.hxx> -#include <editeng/flstitem.hxx> #include <svx/drawitem.hxx> -#include <sfx2/printer.hxx> -#include <svl/smplhint.hxx> -#include <svx/svditer.hxx> -#include <svx/svdobj.hxx> -#include <svx/svdoole2.hxx> -#include <vcl/svapp.hxx> #include <svl/asiancfg.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <editeng/unolingu.hxx> #include <rtl/logfile.hxx> -#include <comphelper/processfactory.hxx> -#include <basic/sbstar.hxx> -#include <basic/basmgr.hxx> -#include <sfx2/app.hxx> - #include "drwlayer.hxx" #include "stlpool.hxx" #include "docsh.hxx" diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 394afb3..a17c92a 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -39,13 +39,9 @@ #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> #include <sfx2/printer.hxx> -#include <svtools/ctrltool.hxx> -#include <svx/pageitem.hxx> #include <svx/postattr.hxx> -#include <unotools/localedatawrapper.hxx> #include <unotools/misccfg.hxx> #include <vcl/virdev.hxx> -#include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include "docsh.hxx" diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index dd572b4..3680178 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -36,35 +36,22 @@ using namespace ::com::sun::star; #include "scitems.hxx" #include <sfx2/fcontnr.hxx> -#include <editeng/eeitem.hxx> #include <sfx2/objface.hxx> -#include <sfx2/app.hxx> -#include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> -#include <sfx2/docfilt.hxx> #include <svtools/ehdl.hxx> #include <basic/sbxcore.hxx> -#include <sfx2/printer.hxx> -#include <sfx2/request.hxx> #include <svtools/sfxecode.hxx> #include <svx/ofaitem.hxx> -#include <sot/formats.hxx> #include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> -#include <tools/multisel.hxx> #include <svx/dataaccessdescriptor.hxx> #include <svx/drawitem.hxx> -#include <svx/fmview.hxx> -#include <svx/pageitem.hxx> -#include <svx/svditer.hxx> -#include <svx/svdpage.hxx> #include <svx/fmshell.hxx> #include <svtools/xwindowitem.hxx> #include <sfx2/passwd.hxx> #include <sfx2/filedlghelper.hxx> -#include <sfx2/docinsert.hxx> -#include "sfx2/dispatch.hxx" +#include <sfx2/dispatch.hxx> #include <svl/PasswordHelper.hxx> #include <svl/documentlockfile.hxx> #include <svl/sharecontrolfile.hxx> diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 89c35ee..1804c40 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -27,12 +27,10 @@ ************************************************************************/ #include "scitems.hxx" -#include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> -#include <svl/smplhint.hxx> #include <com/sun/star/script/vba/XVBACompatibility.hpp> @@ -58,11 +56,6 @@ #include "waitoff.hxx" #include "sizedev.hxx" #include "clipparam.hxx" -#include <basic/sbstar.hxx> -#include <basic/basmgr.hxx> - -#include <memory> -#include <vector> // defined in docfunc.cxx void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const rtl::OUString& sModuleName, const rtl::OUString& sModuleSource ); diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index e88bd5e..cdf9756 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -29,7 +29,6 @@ #include "scitems.hxx" #include <svx/pageitem.hxx> -#include <vcl/virdev.hxx> #include <sfx2/linkmgr.hxx> #include "docsh.hxx" @@ -46,17 +45,13 @@ #include "interpre.hxx" #include "calcconfig.hxx" -#include "formula/FormulaCompiler.hxx" -#include "comphelper/processfactory.hxx" -#include "vcl/msgbox.hxx" +#include <vcl/msgbox.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#include <boost/unordered_set.hpp> - using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::container::XNameAccess; diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index d946a01..2868abc 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -29,12 +29,10 @@ #include <stdio.h> #include <tools/urlobj.hxx> #include <svl/converter.hxx> -#include <svl/zforlist.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> #include <ucbhelper/content.hxx> -#include <unotools/sharedunocomponent.hxx> #include <svx/txenctab.hxx> #include <svx/dbcharsethelper.hxx> diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index abd719e..877dfa1 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -28,23 +28,10 @@ #include "sc.hrc" -#include <stdio.h> -#include <ctype.h> -#include <stdlib.h> -#include <osl/endian.h> #include <i18npool/mslangid.hxx> -#include <tools/string.hxx> -#include <rtl/math.hxx> -#include <svtools/htmlout.hxx> -#include <svl/zforlist.hxx> #include <sot/formats.hxx> #include <sfx2/mieclip.hxx> -#include <unotools/charclass.hxx> -#include <unotools/collatorwrapper.hxx> -#include <unotools/calendarwrapper.hxx> #include <com/sun/star/i18n/CalendarFieldIndex.hpp> -#include <unotools/transliterationwrapper.hxx> -#include <vector> #include "global.hxx" #include "scerrors.hxx" @@ -64,19 +51,14 @@ #include "compiler.hxx" #include "warnbox.hxx" #include "clipparam.hxx" - #include "impex.hxx" - -// ause #include "editutil.hxx" #include "patattr.hxx" #include "docpool.hxx" #include "stringutil.hxx" #include "globstr.hrc" -#include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <osl/module.hxx> //======================================================================== _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits