From 00fb6c9d1c0ad01b29fb617dbe74e6ae1ddf04ce Mon Sep 17 00:00:00 2001 From: Vicente Rafael Estevez Vacas Date: Sun, 22 Apr 2012 11:39:31 +0200 Subject: PATCH: Remove unused code from editing --- svx/inc/svx/sdr/animation/scheduler.hxx | 3 --- .../svx/sdr/contact/viewcontactofsdrmediaobj.hxx | 1 - .../sdr/contact/viewobjectcontactofunocontrol.hxx | 2 -- svx/source/sdr/animation/scheduler.cxx | 7 ------- .../sdr/contact/viewcontactofsdrmediaobj.cxx | 22 ---------------------- .../sdr/contact/viewobjectcontactofunocontrol.cxx | 5 ----- unusedcode.easy | 3 --- 7 files changed, 43 deletions(-) diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/svx/inc/svx/sdr/animation/scheduler.hxx index 61bcaf647372..be2fa36026c2 100644 --- a/svx/inc/svx/sdr/animation/scheduler.hxx +++ b/svx/inc/svx/sdr/animation/scheduler.hxx @@ -133,9 +133,6 @@ namespace sdr // #i38135# void SetTime(sal_uInt32 nTime); - // reset - void Reset(sal_uInt32 nTime); - // execute all ripe events, removes executed ones from the scheduler void triggerEvents(); diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 5a3de115110a..483ea83253e3 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -62,7 +62,6 @@ namespace sdr return (SdrMediaObj&)GetSdrObject(); } - bool hasPreferredSize() const; Size getPreferredSize() const; void updateMediaItem( ::avmedia::MediaItem& rItem ) const; diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index b52fa263c9c4..2addaf190d24 100644 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -64,8 +64,6 @@ namespace sdr { namespace contact { public: ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact ); - /// determines whether an XControl already exists, and is currently visible - bool isControlVisible() const; /// returns the ->XControl instance belonging to the instance, creates it if necessary ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index b3c749102e47..a05194c25e21 100644 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx @@ -274,13 +274,6 @@ namespace sdr } } - void Scheduler::Reset(sal_uInt32 nTime) - { - mnTime = nTime; - mnDeltaTime = 0L; - maList.Clear(); - } - void Scheduler::InsertEvent(Event* pNew) { if(pNew) diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index 65681693158c..4b6eb2280b69 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx @@ -58,28 +58,6 @@ ViewObjectContact& ViewContactOfSdrMediaObj::CreateObjectSpecificViewObjectConta // ------------------------------------------------------------------------------ -bool ViewContactOfSdrMediaObj::hasPreferredSize() const -{ - // #i71805# Since we may have a whole bunch of VOCs here, make a loop - // return true if all have their preferred size - const sal_uInt32 nCount(getViewObjectContactCount()); - bool bRetval(true); - - for(sal_uInt32 a(0); bRetval && a < nCount; a++) - { - ViewObjectContact* pCandidate = getViewObjectContact(a); - - if(pCandidate && !static_cast< ViewObjectContactOfSdrMediaObj* >(pCandidate)->hasPreferredSize()) - { - bRetval = false; - } - } - - return bRetval; -} - -// ------------------------------------------------------------------------------ - Size ViewContactOfSdrMediaObj::getPreferredSize() const { // #i71805# Since we may have a whole bunch of VOCs here, make a loop diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 574628bfaa55..ac9259f7f26d 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -829,11 +829,6 @@ namespace sdr { namespace contact { */ bool impl_isDisposed_nofail() const { return m_pAntiImpl == NULL; } - /** determines whether our control is currently visible - @nofail - */ - bool impl_isControlVisible_nofail() const { return m_bControlIsVisible; } - /** determines whether we are currently a listener at the control for desgin-mode relevant facets @nofail */ diff --git a/unusedcode.easy b/unusedcode.easy index daf8d4cdb178..046ba9a74485 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -730,9 +730,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) -sdr::animation::Scheduler::Reset(unsigned int) -sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const -sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const sfx2::TaskPaneWrapper::GetChildWindowId() 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() -- cgit v1.2.3