From 022b62296c4166486d38f55acf522c62c82894eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 25 Jun 2012 10:01:26 +0100 Subject: [PATCH] callcatcher: update list Change-Id: Id31324a6bf36e937cc6396207913e4183253bf04 --- desktop/source/deployment/misc/dp_misc.cxx | 43 ------------------- .../engine/shapes/drawshapesubsetting.cxx | 10 ----- .../engine/shapes/drawshapesubsetting.hxx | 19 -------- unusedcode.easy | 3 -- 4 files changed, 75 deletions(-) diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index a023f0453686..a2628164b64b 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -494,20 +494,6 @@ void writeConsoleWithStream(::rtl::OUString const & sText, FILE * stream) } #endif -#ifdef WNT -void writeConsoleWithStream(::rtl::OString const & sText, HANDLE stream) -{ - writeConsoleWithStream(OStringToOUString( - sText, RTL_TEXTENCODING_UTF8), stream); -} -#else -void writeConsoleWithStream(::rtl::OString const & sText, FILE * stream) -{ - fprintf(stream, "%s", sText.getStr()); - fflush(stream); -} -#endif - void writeConsole(::rtl::OUString const & sText) { #ifdef WNT @@ -517,15 +503,6 @@ void writeConsole(::rtl::OUString const & sText) #endif } -void writeConsole(::rtl::OString const & sText) -{ -#ifdef WNT - writeConsoleWithStream(sText, GetStdHandle(STD_OUTPUT_HANDLE)); -#else - writeConsoleWithStream(sText, stdout); -#endif -} - void writeConsoleError(::rtl::OUString const & sText) { #ifdef WNT @@ -535,18 +512,6 @@ void writeConsoleError(::rtl::OUString const & sText) #endif } - -void writeConsoleError(::rtl::OString const & sText) -{ -#ifdef WNT - writeConsoleWithStream(sText, GetStdHandle(STD_ERROR_HANDLE)); -#else - writeConsoleWithStream(sText, stderr); -#endif -} - - - OUString readConsole() { #ifdef WNT @@ -580,14 +545,6 @@ void TRACE(::rtl::OUString const & sText) #endif } -void TRACE(::rtl::OString const & sText) -{ - (void) sText; -#if OSL_DEBUG_LEVEL > 1 - writeConsole(sText); -#endif -} - void syncRepositories( bool force, Reference const & xCmdEnv) { diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index eea1202c45fd..42ce5c3bafe0 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -293,16 +293,6 @@ namespace slideshow initCurrentSubsets(); } - void DrawShapeSubsetting::reset( const DocTreeNode& rShapeSubset, - const ::boost::shared_ptr< GDIMetaFile >& rMtf ) - { - reset(); - mpMtf = rMtf; - maSubset = rShapeSubset; - - initCurrentSubsets(); - } - void DrawShapeSubsetting::initCurrentSubsets() { // only add subset to vector, if it's not empty - that's diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx index dbf5ff26c591..0863204bcbf6 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx @@ -86,25 +86,6 @@ namespace slideshow */ void reset( const ::boost::shared_ptr< GDIMetaFile >& rMtf ); - /** Reset metafile and subset. - - Use this method to completely reset the - ShapeSubsetting, with a new metafile and subset - range. Note that any information previously set will - be lost, including added subset shapes! - - @param rShapeSubset - The subset this object represents (can be empty, then - denoting 'represents a whole shape') - - @param rMtf - Metafile to retrieve subset info from (must have been - generated with verbose text comments switched on). - */ - void reset( const DocTreeNode& rShapeSubset, - const ::boost::shared_ptr< GDIMetaFile >& rMtf ); - - // Shape subsetting methods // ======================================================== diff --git a/unusedcode.easy b/unusedcode.easy index cc97539334ef..d45fada264d5 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -615,8 +615,6 @@ dbtools::SQLExceptionInfo::SQLExceptionInfo(com::sun::star::sdb::SQLErrorEvent c dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdb::SQLContext const&) dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdbc::SQLWarning const&) dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference const&) -dp_misc::TRACE(rtl::OString const&) -dp_misc::writeConsoleError(rtl::OString const&) drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const formula::FormulaTokenIterator::First() @@ -633,7 +631,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) -slideshow::internal::DrawShapeSubsetting::reset(slideshow::internal::DocTreeNode const&, boost::shared_ptr const&) std::__cxx1998::multimap<_xmlNode*, com::sun::star::uno::Reference, std::less<_xmlNode*>, std::allocator > > >::~multimap() std::__cxx1998::vector >::~vector() std::__cxx1998::vector >::~vector()