[Libreoffice-commits] .: 2 commits - svx/inc svx/source unusedcode.easy
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
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 {
*/
boolimpl_isDisposed_nofail() const { return m_pAntiImpl == NULL; }
+/** determines whether our control is currently visible
+@nofail
+*/
+boolimpl_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
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();
}
-boolhasPreferredSize() const;
SizegetPreferredSize() const;
voidupdateMediaItem( ::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
-boolisControlVisible() 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
//
---
[Libreoffice-commits] .: 2 commits - svx/inc svx/source
svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx |3 -
svx/inc/svx/tbcontrl.hxx | 39 -
svx/source/sdr/attribute/sdrfilltextattribute.cxx |7 ---
svx/source/tbxctrls/tbcontrl.cxx |1
4 files changed, 50 deletions(-)
New commits:
commit 11f5d3db58dcce64a964d1e4d26eb81e2bb709f1
Author: Winfried Donkers
Date: Thu Apr 5 14:34:22 2012 +0530
Unused code removal.
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 7cc2479..fcf3e5d 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -48,14 +48,6 @@
Additional information
from DocShell: SvxFontListItem (SID_ATTR_CHAR_FONTLIST)
-SvxFontHeightToolBoxControl
----
-Item type: SvxFontHeightItem
-Execute-Id: SID_ATTR_CHAR_FONTHEIGHT
--> SvxFontHeightItem
-Additional information
-from DocShell: SvxFontListItem (SID_ATTR_CHAR_FONTLIST)
-
SvxFontColorToolBoxControl
--
Item type: SvxFontColorItem
@@ -173,7 +165,6 @@
class SvxLineItem;
class SvxBoxInfoItem;
class SvxFontItem;
-class SvxFontHeightItem;
class SfxStyleControllerItem_Impl;
class SfxStyleSheetBasePool;
class SfxTemplateItem;
@@ -256,35 +247,6 @@ public:
//
-// class SvxFontHeightToolBoxControl -
-//
-
-/*
-class SvxFontSizeItem;
-class SvxFontItem;
-class SvxFontSizeBox_Impl;
-
-class SVX_DLLPUBLIC SvxFontHeightToolBoxControl : public SfxToolBoxControl
-{
-SvxFontSizeBox_Impl* pBox; // ItemWindow f"ur
quick-access
-::com::sun::star::awt::FontDescriptor aCurrentFont; // Kopie des aktuellen
Fonts
-
-public:
-SFX_DECL_TOOLBOX_CONTROL();
-SvxFontHeightToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox&
rTbx );
-~SvxFontHeightToolBoxControl();
-
-// new controller API
-// XStatusListener
-virtual void SAL_CALL statusChanged( const
::com::sun::star::frame::FeatureStateEvent& Event )
-throw ( ::com::sun::star::uno::RuntimeException );
-
-virtual Window* CreateItemWindow( Window *pParent );
-};
-*/
-
-
-//
// class SvxFontColorToolBoxControl --
//
@@ -334,7 +296,6 @@ public:
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
virtual voidSelect( sal_Bool bMod1 = sal_False );
-
};
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f9f25a8..b504d68 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -68,7 +68,6 @@
#include
#include
#include
-#include
#include
#include
commit 62f5df61ff89269e177dd2b8a9d939f49cdbea2d
Author: Santiago Martinez
Date: Thu Apr 5 14:33:20 2012 +0530
Unused code removal.
diff --git a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
index 30fad2d..3dfeea9 100644
--- a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
@@ -56,9 +56,6 @@ namespace drawinglayer
SdrFillTextAttribute(const SdrFillTextAttribute& rCandidate);
SdrFillTextAttribute& operator=(const SdrFillTextAttribute&
rCandidate);
-// checks if the incarnation is default constructed
-bool isDefault() const;
-
// compare operator
bool operator==(const SdrFillTextAttribute& rCandidate) const;
diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx
b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
index 3ab55bd..f36cf7f 100644
--- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
@@ -68,13 +68,6 @@ namespace drawinglayer
return *this;
}
-bool SdrFillTextAttribute::isDefault() const
-{
-return(getFill().isDefault()
-&& getFillFloatTransGradient().isDefault()
-&& getText().isDefault());
-}
-
bool SdrFillTextAttribute::operator==(const SdrFillTextAttribute&
rCandidate) const
{
return(getFill() == rCandidate.getFill()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
