diff options
author | Christina Rossmanith <ChrRossmanith@web.de> | 2012-03-20 13:57:59 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-20 13:57:59 +0000 |
commit | dbd9198aa9d325dd5bbeb110cc8a3db57838d1e6 (patch) | |
tree | 69e0f9e670e5db4f0d659e2616be1a05503e654a /sdext | |
parent | fdd18639075f6ac7b3ec2ff735e7de2bdf550964 (diff) |
Remove unused code (sdext)
Diffstat (limited to 'sdext')
-rw-r--r-- | sdext/source/presenter/PresenterController.cxx | 5 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterController.hxx | 1 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterGeometryHelper.cxx | 19 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterGeometryHelper.hxx | 4 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSprite.cxx | 17 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSprite.hxx | 6 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSpritePane.cxx | 4 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterSpritePane.hxx | 2 |
8 files changed, 0 insertions, 58 deletions
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 9629aab262a8..46960c958376 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 196adb62b26b..8b533420ddae 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 af75dee0ce1f..211bf8e10250 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 b5901a68fd8d..4e8874866ba8 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 45ea49bcf394..0fca939b0f34 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 4ae4024274d0..58755d7a8e44 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 256230bd41ec..52895ba13dd8 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 1e23faf5d46b..fad67722cd82 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) |