[Libreoffice-commits] .: 2 commits - svx/inc svx/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Apr 23 15:21:23 PDT 2012
svx/inc/svx/sdr/animation/scheduler.hxx | 3 -
svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx | 1
svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx | 2 -
svx/source/sdr/animation/scheduler.cxx | 7 ----
svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx | 22 --------------
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 8 -----
unusedcode.easy | 3 -
7 files changed, 46 deletions(-)
New commits:
commit 9be39efcc55f9c4a8f7c02bdded299c0ef7e54fd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 23 23:12:46 2012 +0100
callcatcher: fix up isControlVisible
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index ac9259f..fb3ad54 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -829,6 +829,11 @@ 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
*/
@@ -1714,14 +1719,6 @@ namespace sdr { namespace contact {
}
//--------------------------------------------------------------------
- bool ViewObjectContactOfUnoControl::isControlVisible() const
- {
- SolarMutexGuard aSolarGuard;
- const ControlHolder& rControl( m_pImpl->getExistentControl() );
- return rControl.is() && rControl.isVisible();
- }
-
- //--------------------------------------------------------------------
Reference< XControl > ViewObjectContactOfUnoControl::getControl()
{
SolarMutexGuard aSolarGuard;
commit 00fb6c9d1c0ad01b29fb617dbe74e6ae1ddf04ce
Author: Vicente Rafael Estevez Vacas <rafaestevez at yahoo.es>
Date: Sun Apr 22 11:39:31 2012 +0200
PATCH: Remove unused code from editing
diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/svx/inc/svx/sdr/animation/scheduler.hxx
index 61bcaf6..be2fa36 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 5a3de11..483ea83 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 b52fa26..2addaf1 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 b3c7491..a05194c 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 6568169..4b6eb22 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 574628b..ac9259f 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 daf8d4c..046ba9a 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<GDIMetaFile> const&)
std::__cxx1998::multimap<_xmlNode*, com::sun::star::uno::Reference<com::sun::star::xml::dom::events::XEventListener>, std::less<_xmlNode*>, std::allocator<std::pair<_xmlNode* const, com::sun::star::uno::Reference<com::sun::star::xml::dom::events::XEventListener> > > >::~multimap()
More information about the Libreoffice-commits
mailing list