diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:20 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:20 +0200 |
commit | 18b27513f13bda279f2fe4cb93f0df56b1928864 (patch) | |
tree | 1b8597320c9b2e8389cce9016e45631a23d648c8 /sdext/source/presenter/PresenterPaneAnimator.cxx | |
parent | c8e1c7822ef95330737b5f820b66e20e1d5dc23c (diff) |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 14dabe1c7117cf14295b3435228b6f24f0143f0d (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:25 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit f0ba077fb96691d302489a28c1cb67c9bf150f39
Author: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Tue Sep 14 17:27:42 2010 +0200
moving languagetool to the right repository
.../languagetool/JLanguageTool-1.0.0.patch | 137 ++++++++++++++++++++
languagetool/languagetool/makefile.mk | 67 ++++++++++
languagetool/languagetool/prj/build.lst | 3 +
languagetool/languagetool/prj/d.lst | 1 +
4 files changed, 208 insertions(+), 0 deletions(-)
commit f62b698d7387ddd78bf205bc44af3fb3adbed295
Author: Kalman Szalai - KAMI <kamihir@freemail.hu>
Date: Tue Sep 14 16:57:26 2010 +0200
extensions_deliver.diff: Deliver extensions to the solver
sdext/prj/d.lst | 3 +++
swext/prj/d.lst | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
commit 7553ed5a48ee9d1eff4dce30509ce0d682687b20
Author: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Tue Sep 14 10:50:46 2010 +0200
win32-pdfimport-use-temporary-file.diff: avoid locking issues on win32
sdext/source/pdfimport/pdfiadaptor.cxx | 2 +-
sdext/source/pdfimport/wrapper/wrapper.cxx | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
commit 8483892bd836c37b4e4a171745e37ceae88d0a16
Merge: 6a13c46 89ba628
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:01 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit 89ba628baeac602f71f4b096e08d50b16c715c47 (tag: refs/tags/ooo/OOO330_m7, tag: refs/tags/ooo/OOO330_m6, tag: refs/tags/ooo/OOO330_m5)
Merge: 4571732 ed49424
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 16:59:10 2010 +0200
CWS-TOOLING: integrate CWS txtl10n
commit ed494241621de2f1c37b632d2d970f259df8deef
Merge: f1aba18 4571732
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue Jul 27 16:50:00 2010 +0200
merged OOO330 m2
commit f1aba18563ab79ae2c3ca594d43130adf70f72c1
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Fri Jul 23 13:02:53 2010 +0200
txtl10n: removal of verbose switch
swext/mediawiki/help/makefile.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Notes
Notes:
split repo tag: extensions_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sdext/source/presenter/PresenterPaneAnimator.cxx')
-rw-r--r-- | sdext/source/presenter/PresenterPaneAnimator.cxx | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx b/sdext/source/presenter/PresenterPaneAnimator.cxx index a37b58e55c60..4ad652f7d824 100644 --- a/sdext/source/presenter/PresenterPaneAnimator.cxx +++ b/sdext/source/presenter/PresenterPaneAnimator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ namespace { const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId); void RestoreFrozenWindows (void); void FreezePanes (const Reference<rendering::XSpriteCanvas>& rxCanvas); - + protected: ::rtl::Reference<PresenterController> mpPresenterController; ::rtl::Reference<PresenterPaneContainer> mpPaneContainer; @@ -91,7 +91,7 @@ namespace { bool mbDoAnimation; EndActions maShowEndActions; EndActions maHideEndActions; - + void DeactivatePanes (void); void ResizePane ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, @@ -110,9 +110,9 @@ namespace { const bool bAnimate, const EndActions& rShowEndActions, const EndActions& rEndEndActions); - + virtual ~UnfoldInCenterAnimator (void); - + virtual void ShowPane (void); virtual void HidePane (void); @@ -136,10 +136,10 @@ namespace { const EndActions& rShowEndActions, const EndActions& rEndEndActions); virtual ~MoveInFromBottomAnimator (void); - + virtual void ShowPane (void); virtual void HidePane (void); - + private: ::boost::shared_ptr<PresenterSprite> maNewPaneSprite; geometry::RealRectangle2D maCenterPaneBox; @@ -164,10 +164,10 @@ namespace { const EndActions& rShowEndActions, const EndActions& rEndEndActions); virtual ~TransparentOverlayAnimator (void); - + virtual void ShowPane (void); virtual void HidePane (void); - + private: PresenterSprite maBackgroundSprite; void CreateBackgroundSprite (void); @@ -226,7 +226,7 @@ namespace { awt::Rectangle maOriginalBoundingBox; css::geometry::RealRectangle2D maCurrentBoundingBox; ::boost::shared_ptr<PresenterSprite> mpSubstitution; - + }; typedef ::boost::shared_ptr<PaneGroup> SharedPaneGroup; @@ -387,7 +387,7 @@ void PresenterPaneAnimatorBase::DeactivatePanes (void) (*iGroup)->DeactivatePanes(); (*iGroup)->HidePanes(); } - + mpWindowManager->Update(); } @@ -511,9 +511,9 @@ void UnfoldInCenterAnimator::ShowPane (void) // Create two pane groups that will be moved together. One contains the // notes view, the other group contains all other panes. SetupPaneGroups(); - + // Setup the places where the two pane groups are moved to. - maCenterPaneBox + maCenterPaneBox = MovePanesAway(geometry::RealRectangle2D(0,200,aWindowBox.Width, aWindowBox.Height-200)); // Setup the final size of the new pane so that it fits into the space @@ -582,7 +582,7 @@ void UnfoldInCenterAnimator::ShowPane (void) nY0, maCenterPaneBox.Y1, _1)); - + // Call updateScreen after each animation step. if (xCanvas.is()) pMultiAnimation->AddAnimation( @@ -609,14 +609,14 @@ void UnfoldInCenterAnimator::ShowPane (void) void UnfoldInCenterAnimator::HidePane (void) { OSL_ASSERT(mpWindowManager.get()!=NULL); - + Reference<awt::XWindow> xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); if ( ! xParentWindow.is()) return; DeactivatePanes(); DeactivatePane(mxCenterPaneId); - + ::boost::shared_ptr<PresenterAnimator> pAnimator (mpPresenterController->GetAnimator()); const awt::Rectangle aWindowBox (xParentWindow->getPosSize()); const rendering::ViewState aViewState ( @@ -627,7 +627,7 @@ void UnfoldInCenterAnimator::HidePane (void) NULL, Sequence<double>(4), rendering::CompositeOperation::SOURCE); - + // Animate the uppder and lower window bitmaps. Reference<rendering::XSpriteCanvas> xSpriteCanvas (mpWindowManager->GetParentCanvas(), UNO_QUERY); ::boost::shared_ptr<MultiAnimation> pMultiAnimation (new MultiAnimation(mbDoAnimation ? 500 : 1)); @@ -644,7 +644,7 @@ void UnfoldInCenterAnimator::HidePane (void) GetLocation((*iGroup)->GetCurrentBoundingBox()), GetLocation((*iGroup)->GetOriginalBoundingBox()))); } - + // Animate the new center pane to collapse. const double nY0 ((maPaneGroups[0]->GetOriginalBoundingBox().Y2 + maPaneGroups[1]->GetOriginalBoundingBox().Y1) / 2); @@ -671,7 +671,7 @@ void UnfoldInCenterAnimator::HidePane (void) EndActions::const_iterator iAction; for (iAction=maHideEndActions.begin(); iAction!=maHideEndActions.end(); ++iAction) pMultiAnimation->AddEndCallback(*iAction); - + pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation)); } @@ -709,7 +709,7 @@ geometry::RealRectangle2D UnfoldInCenterAnimator::MovePanesAway ( { SharedPaneGroup aUpperPanes = maPaneGroups[0]; SharedPaneGroup aLowerPanes = maPaneGroups[1]; - + // Move upper pane group out of the way. const double nTop (rFreeCenterArea.Y1); const double nUpperVerticalOffset (nTop - aUpperPanes->GetOriginalBoundingBox().Y2); @@ -796,7 +796,7 @@ void MoveInFromBottomAnimator::ShowPane (void) geometry::RealPoint2D aStartLocation (maCenterPaneBox.X1, aWindowBox.Height); geometry::RealPoint2D aEndLocation (maCenterPaneBox.X1, maCenterPaneBox.Y1); - + // Get the sprite of the new pane, make it visible and move it to the // start location. PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( @@ -805,7 +805,7 @@ void MoveInFromBottomAnimator::ShowPane (void) { if (pDescriptor->mxBorderWindow.is()) pDescriptor->mxBorderWindow->setVisible(sal_True); - + maNewPaneSprite = pDescriptor->maSpriteProvider(); if (maNewPaneSprite.get() != NULL) { @@ -832,7 +832,7 @@ void MoveInFromBottomAnimator::ShowPane (void) void MoveInFromBottomAnimator::HidePane (void) { OSL_ASSERT(mpWindowManager.get()!=NULL); - + Reference<awt::XWindow> xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); if ( ! xParentWindow.is()) return; @@ -845,13 +845,13 @@ void MoveInFromBottomAnimator::HidePane (void) DeactivatePane(mxCenterPaneId); SharedPaneGroup aPanes (maPaneGroups[0]); - + aPanes->ShowPanes(); ::boost::shared_ptr<MultiAnimation> pMultiAnimation ( new MultiAnimation(mbDoAnimation ? 500 : 0)); awt::Rectangle aWindowBox (xParentWindow->getPosSize()); - + // Animate the new center pane to collapse. pMultiAnimation->AddAnimation( ::boost::bind( @@ -871,7 +871,7 @@ void MoveInFromBottomAnimator::HidePane (void) EndActions::const_iterator iAction; for (iAction=maHideEndActions.begin(); iAction!=maHideEndActions.end(); ++iAction) pMultiAnimation->AddEndCallback(*iAction); - + ::boost::shared_ptr<PresenterAnimator> pAnimator (mpPresenterController->GetAnimator()); pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation)); } @@ -978,7 +978,7 @@ void TransparentOverlayAnimator::ShowPane (void) pAllPanes->DeactivatePanes(); mpWindowManager->Update(); } - + PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( mpPaneContainer->FindPaneId(mxCenterPaneId)); if (pDescriptor.get() != NULL) @@ -1038,7 +1038,7 @@ void TransparentOverlayAnimator::CreateBackgroundSprite (void) Sequence<double>(4), rendering::CompositeOperation::SOURCE); PresenterCanvasHelper::SetDeviceColor(aRenderState, util::Color(0x80808080)); - + Reference<rendering::XPolyPolygon2D> xPolygon ( PresenterGeometryHelper::CreatePolygon(aWindowBox, xCanvas->getDevice())); if (xPolygon.is()) @@ -1112,7 +1112,7 @@ void PaneGroup::CreateSubstitution (const Reference<rendering::XSpriteCanvas>& r NULL, Sequence<double>(4), rendering::CompositeOperation::SOURCE); - + Reference<rendering::XCanvas> xSpriteCanvas (mpSubstitution->GetCanvas()); if (xSpriteCanvas.is()) xSpriteCanvas->drawBitmap(xBackgroundBitmap, aViewState, aRenderState); @@ -1323,7 +1323,7 @@ template<typename T> const T aFinalValue) { const double nQ (1 - nP); - + rSetter(T(nQ * aInitialValue + nP * aFinalValue)); } @@ -1342,7 +1342,7 @@ void SpriteTransform( const double nP) { OSL_ASSERT(rpPaintManager.get()!=NULL); - + PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( rpPaneContainer->FindPaneId(rxPaneId)); if (pDescriptor.get() != NULL @@ -1363,7 +1363,7 @@ void SpriteTransform( sal::static_int_cast<sal_Int32>(pSprite->GetLocation().Y), sal::static_int_cast<sal_Int32>(pSprite->GetSize().Width), sal::static_int_cast<sal_Int32>(pSprite->GetSize().Height))); - + const double nYScale (bAppear ? nP : 1-nP); pSprite->Transform(geometry::AffineMatrix2D( 1, 0, 0, |