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 --------------------------------- 4 files changed, 154 deletions(-) delete mode 100644 canvas/inc/canvas/prioritybooster.hxx delete mode 100644 canvas/source/tools/prioritybooster.cxx (limited to 'canvas') 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: */ -- cgit