Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index 

Hi,
some more code removal. Probably the private variable maTransform can be removed as well: it is initialized with the identity transform and never changed afterwards. 

Christina

From 50b891e4dc8c9ae3587ea59a8f9e02c5ec21bf6a Mon Sep 17 00:00:00 2001
From: Christina Rossmanith <ChrRossmanith@web.de>
Date: Sat, 17 Mar 2012 20:57:16 +0100
Subject: [PATCH] Remove unused code (sdext)

---
 sdext/source/presenter/PresenterController.cxx     |    5 -----
 sdext/source/presenter/PresenterController.hxx     |    1 -
 sdext/source/presenter/PresenterGeometryHelper.cxx |   19 -------------------
 sdext/source/presenter/PresenterGeometryHelper.hxx |    4 ----
 sdext/source/presenter/PresenterSprite.cxx         |   17 -----------------
 sdext/source/presenter/PresenterSprite.hxx         |    6 ------
 sdext/source/presenter/PresenterSpritePane.cxx     |    4 ----
 sdext/source/presenter/PresenterSpritePane.hxx     |    2 --
 unusedcode.easy                                    |    8 --------
 9 files changed, 0 insertions(+), 66 deletions(-)

diff --git a/sdext/source/presenter/PresenterController.cxx 
b/sdext/source/presenter/PresenterController.cxx
index 9629aab..46960c9 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -494,11 +494,6 @@ rtl::Reference<PresenterPaneContainer> PresenterController::GetPaneContainer 
(vo
     return mpPaneBorderPainter;
 }
 
-::boost::shared_ptr<PresenterAnimator> PresenterController::GetAnimator (void) const
-{
-    return mpAnimator;
-}
-
 ::boost::shared_ptr<PresenterCanvasHelper> PresenterController::GetCanvasHelper (void) const
 {
     return mpCanvasHelper;
diff --git a/sdext/source/presenter/PresenterController.hxx 
b/sdext/source/presenter/PresenterController.hxx
index 196adb6..8b53342 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -119,7 +119,6 @@ public:
         GetSlideShowController (void) const;
     rtl::Reference<PresenterPaneContainer> GetPaneContainer (void) const;
     ::rtl::Reference<PresenterPaneBorderPainter> GetPaneBorderPainter (void) const;
-    ::boost::shared_ptr<PresenterAnimator> GetAnimator (void) const;
     ::boost::shared_ptr<PresenterCanvasHelper> GetCanvasHelper (void) const;
     css::uno::Reference<css::drawing::XPresenterHelper> GetPresenterHelper (void) const;
     ::boost::shared_ptr<PresenterPaintManager> GetPaintManager (void) const;
diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx 
b/sdext/source/presenter/PresenterGeometryHelper.cxx
index af75dee..211bf8e 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.cxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.cxx
@@ -161,25 +161,6 @@ bool PresenterGeometryHelper::IsInside (
         && rBox1.Y+rBox1.Height <= rBox2.Y+rBox2.Height;
 }
 
-awt::Rectangle PresenterGeometryHelper::Union (
-    const css::awt::Rectangle& rBox1,
-    const css::awt::Rectangle& rBox2)
-{
-    if (rBox1.Width<=0 || rBox1.Height<=0)
-        return rBox2;
-    else if (rBox2.Width<=0 || rBox2.Height<=0)
-        return rBox1;
-
-    const sal_Int32 nLeft (::std::min(rBox1.X, rBox2.X));
-    const sal_Int32 nTop (::std::min(rBox1.Y, rBox2.Y));
-    const sal_Int32 nRight (::std::max(Right(rBox1), Right(rBox2)));
-    const sal_Int32 nBottom (::std::max(Bottom(rBox1), Bottom(rBox2)));
-    if (nLeft >= nRight || nTop >= nBottom)
-        return awt::Rectangle();
-    else
-        return awt::Rectangle(nLeft,nTop, Width(nLeft,nRight), Height(nTop,nBottom));
-}
-
 geometry::RealRectangle2D PresenterGeometryHelper::Union (
     const geometry::RealRectangle2D& rBox1,
     const geometry::RealRectangle2D& rBox2)
diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx 
b/sdext/source/presenter/PresenterGeometryHelper.hxx
index b5901a6..4e88748 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.hxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.hxx
@@ -93,10 +93,6 @@ public:
         const css::awt::Rectangle& rBox1,
         const css::awt::Rectangle& rBox2);
 
-    static css::awt::Rectangle Union (
-        const css::awt::Rectangle& rBox1,
-        const css::awt::Rectangle& rBox2);
-
     static css::geometry::RealRectangle2D Union (
         const css::geometry::RealRectangle2D& rBox1,
         const css::geometry::RealRectangle2D& rBox2);
diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx
index 45ea49b..0fca939 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -109,11 +109,6 @@ void PresenterSprite::Resize (const css::geometry::RealSize2D& rSize)
         ProvideSprite();
 }
 
-css::geometry::RealSize2D PresenterSprite::GetSize (void) const
-{
-    return maSize;
-}
-
 void PresenterSprite::MoveTo (const css::geometry::RealPoint2D& rLocation)
 {
     maLocation = rLocation;
@@ -131,18 +126,6 @@ void PresenterSprite::MoveTo (const css::geometry::RealPoint2D& rLocation)
             );
 }
 
-css::geometry::RealPoint2D PresenterSprite::GetLocation (void) const
-{
-    return maLocation;
-}
-
-void PresenterSprite::Transform (const css::geometry::AffineMatrix2D& rTransform)
-{
-    maTransform = rTransform;
-    if (mxSprite.is())
-        mxSprite->transform(maTransform);
-}
-
 void PresenterSprite::SetAlpha (const double nAlpha)
 {
     mnAlpha = nAlpha;
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx
index 4ae4024..58755d7 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -64,13 +64,7 @@ public:
     void Hide (void);
 
     void Resize (const css::geometry::RealSize2D& rSize);
-    css::geometry::RealSize2D GetSize (void) const;
-
     void MoveTo (const css::geometry::RealPoint2D& rLocation);
-    css::geometry::RealPoint2D GetLocation (void) const;
-
-    void Transform (const css::geometry::AffineMatrix2D& rTransform);
-
     void SetAlpha (const double nAlpha);
 
     void Update (void);
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx 
b/sdext/source/presenter/PresenterSpritePane.cxx
index 256230b..52895ba 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -163,10 +163,6 @@ void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent)
     return mpSprite;
 }
 
-void PresenterSpritePane::ShowTransparentBorder (void)
-{
-}
-
 void PresenterSpritePane::UpdateCanvases (void)
 {
     Reference<XComponent> xContentCanvasComponent (mxContentCanvas, UNO_QUERY);
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx 
b/sdext/source/presenter/PresenterSpritePane.hxx
index 1e23faf..fad6772 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sdext/source/presenter/PresenterSpritePane.hxx
@@ -78,8 +78,6 @@ public:
         const css::uno::Reference<css::uno::XComponentContext>& rxContext)
         SAL_THROW((css::uno::Exception));
 
-    void ShowTransparentBorder (void);
-
     // XPane
 
     virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
diff --git a/unusedcode.easy b/unusedcode.easy
index d36f5d1..5c9112b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -970,14 +970,6 @@ sd::slidesorter::view::(anonymous 
namespace)::PageObjectRun::GetInnerBoundingBox
 sd::slidesorter::view::Button::IsDown() const
 sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&)
 sdext::presenter::PresenterAnimation::PresenterAnimation(unsigned long, unsigned long, unsigned 
long)
-sdext::presenter::PresenterController::GetAnimator() const
-sdext::presenter::PresenterGeometryHelper::Union(com::sun::star::awt::Rectangle const&, 
com::sun::star::awt::Rectangle const&)
-sdext::presenter::PresenterHorizontalScrollBar::PresenterHorizontalScrollBar(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>
 const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, 
boost::shared_ptr<sdext::presenter::PresenterPaintManager> const&, boost::function<void (double)> 
const&)
-sdext::presenter::PresenterSprite::GetLocation() const
-sdext::presenter::PresenterSprite::GetSize() const
-sdext::presenter::PresenterSprite::SetAlpha(double)
-sdext::presenter::PresenterSprite::Transform(com::sun::star::geometry::AffineMatrix2D const&)
-sdext::presenter::PresenterSpritePane::ShowTransparentBorder()
 sdr::animation::Scheduler::Reset(unsigned int)
 sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
 sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const
-- 
1.7.4.1

Context

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.