[ooo-build-commit] patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Wed Sep 30 19:53:17 PDT 2009
patches/dev300/apply | 11 +
patches/dev300/link-as-needed-bf-m58.diff | 23 +++
patches/dev300/link-as-needed-bf.diff | 4
patches/dev300/slideshow-effect-rewind-sdext-m58.diff | 115 ++++++++++++++++++
patches/dev300/slideshow-effect-rewind-sdext.diff | 6
5 files changed, 154 insertions(+), 5 deletions(-)
New commits:
commit fc3f51e4f859b36185b7a28f484af3eb26ca2277
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Sep 30 22:52:13 2009 -0400
Final adjustment of patches for dev300-m60.
Now all patches apply against dev300-m60. But it is not
build-tested yet.
* patches/dev300/apply:
* patches/dev300/link-as-needed-bf-m58.diff:
* patches/dev300/link-as-needed-bf.diff:
* patches/dev300/slideshow-effect-rewind-sdext-m58.diff:
* patches/dev300/slideshow-effect-rewind-sdext.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 99e0ffc..d8688b4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1412,9 +1412,14 @@ SectionOwner => pmladek
# STLport fixes
binfilter-stl.diff, i#63770, hmth
+[ BFBuildBits >= dev300-m60 ]
# use -Wl,--as-needed, save 1% of relocations
link-as-needed-bf.diff, i#89511, pmladek
+[ BFBuildBits < dev300-m60 ]
+# use -Wl,--as-needed, save 1% of relocations
+link-as-needed-bf-m58.diff, i#89511, pmladek
+
[ SystemBuildBits ]
# !!!! applied only when libs_extern_sys source tarball is unpacked !!!!
SectionOwner => fridrich
@@ -3185,10 +3190,14 @@ slideshow-effect-rewind-m58.diff, i#48179, thorsten
# correctly set table row height during ppt import
svx-ppt-tablerow-height-fix.diff, n#483951, i#100275, thorsten
-[ ExtensionFixes ]
+[ ExtensionFixes >= dev300-m60 ]
# Fix from Andre, allows to step back one animation effect
slideshow-effect-rewind-sdext.diff, i#48179, thorsten
+[ ExtensionFixes < dev300-m60 ]
+# Fix from Andre, allows to step back one animation effect
+slideshow-effect-rewind-sdext-m58.diff, i#48179, thorsten
+
[ OxygenOfficeDefaultSettings ]
#Create langpack and full installers
ooop-langpack-policy.diff
diff --git a/patches/dev300/link-as-needed-bf-m58.diff b/patches/dev300/link-as-needed-bf-m58.diff
new file mode 100644
index 0000000..dcbff04
--- /dev/null
+++ b/patches/dev300/link-as-needed-bf-m58.diff
@@ -0,0 +1,23 @@
+Index: filter/source/bf_offwrp/makefile.mk
+===================================================================
+RCS file: /cvs/framework/binfilter/filter/source/bf_offwrp/makefile.mk,v
+retrieving revision 1.15
+diff -u -r1.15 makefile.mk
+--- binfilter/filter/source/bf_offwrp/makefile.mk 10 Apr 2008 21:16:58 -0000 1.15
++++ binfilter/filter/source/bf_offwrp/makefile.mk 14 May 2008 16:19:23 -0000
+@@ -57,7 +57,6 @@
+
+ SHL1IMPLIB= ibf_wrp
+ SHL1STDLIBS= \
+- $(BFSO3LIB) \
+ $(SJLIB) \
+ $(BFSVTOOLLIB) \
+ $(BFOFALIB) \
+@@ -75,6 +74,7 @@
+ $(BFSDLIB) \
+ $(BFSCLIB) \
+ $(BFSVXLIB) \
++ $(BFSO3LIB) \
+ $(UNOTOOLSLIB) \
+ $(COMPHELPERLIB) \
+ $(LEGACYSMGRLIB)
diff --git a/patches/dev300/link-as-needed-bf.diff b/patches/dev300/link-as-needed-bf.diff
index dcbff04..28259a1 100644
--- a/patches/dev300/link-as-needed-bf.diff
+++ b/patches/dev300/link-as-needed-bf.diff
@@ -1,4 +1,4 @@
-Index: filter/source/bf_offwrp/makefile.mk
+Index: binfilter/filter/source/bf_offwrp/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/filter/source/bf_offwrp/makefile.mk,v
retrieving revision 1.15
@@ -10,9 +10,9 @@ diff -u -r1.15 makefile.mk
SHL1IMPLIB= ibf_wrp
SHL1STDLIBS= \
- $(BFSO3LIB) \
- $(SJLIB) \
$(BFSVTOOLLIB) \
$(BFOFALIB) \
+ $(VCLLIB) \
@@ -75,6 +74,7 @@
$(BFSDLIB) \
$(BFSCLIB) \
diff --git a/patches/dev300/slideshow-effect-rewind-sdext-m58.diff b/patches/dev300/slideshow-effect-rewind-sdext-m58.diff
new file mode 100644
index 0000000..be134d6
--- /dev/null
+++ b/patches/dev300/slideshow-effect-rewind-sdext-m58.diff
@@ -0,0 +1,115 @@
+Updated slideshow effect rewind feature from CWS slideshow1
+
+From: Thorsten Behrens <thb at openoffice.org>
+
+
+---
+
+ offapi/com/sun/star/presentation/XSlideShow.idl | 37 ++
+ .../sun/star/presentation/XSlideShowController.idl | 8
+ .../sun/star/presentation/XSlideShowListener.idl | 6
+ sd/source/ui/slideshow/slideshowimpl.cxx | 120 +++++-
+ sd/source/ui/slideshow/slideshowimpl.hxx | 8
+ sdext/source/presenter/PresenterController.cxx | 11 -
+ .../presenter/PresenterCurrentSlideObserver.cxx | 4
+ .../presenter/PresenterCurrentSlideObserver.hxx | 2
+ sdext/source/presenter/description.xml | 4
+ .../source/engine/animationnodes/basenode.hxx | 6
+ .../animationnodes/sequentialtimecontainer.cxx | 6
+ slideshow/source/engine/effectrewinder.cxx | 432 ++++++++++++++++++++
+ slideshow/source/engine/effectrewinder.hxx | 185 +++++++++
+ slideshow/source/engine/eventmultiplexer.cxx | 10
+ slideshow/source/engine/eventqueue.cxx | 47 ++
+ slideshow/source/engine/makefile.mk | 1
+ slideshow/source/engine/screenupdater.cxx | 83 ++++
+ slideshow/source/engine/shapes/drawshape.cxx | 6
+ slideshow/source/engine/slide/layermanager.cxx | 105 ++---
+ slideshow/source/engine/slide/layermanager.hxx | 35 --
+ slideshow/source/engine/slideshowimpl.cxx | 270 ++++++++++---
+ slideshow/source/engine/usereventqueue.cxx | 54 ++-
+ slideshow/source/inc/eventqueue.hxx | 8
+ slideshow/source/inc/screenupdater.hxx | 21 +
+ slideshow/source/inc/usereventqueue.hxx | 18 +
+ 25 files changed, 1303 insertions(+), 184 deletions(-)
+ create mode 100644 slideshow/source/engine/effectrewinder.cxx
+ create mode 100644 slideshow/source/engine/effectrewinder.hxx
+
+
+diff --git sdext/source/presenter/PresenterController.cxx sdext/source/presenter/PresenterController.cxx
+index 9c54364..975b116 100644
+--- sdext/source/presenter/PresenterController.cxx
++++ sdext/source/presenter/PresenterController.cxx
+@@ -918,13 +918,22 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
+ break;
+
+ case awt::Key::PAGEUP:
++ if (mxSlideShowController.is())
++ {
++ if (rEvent.Modifiers == awt::KeyModifier::MOD2)
++ mxSlideShowController->gotoPreviousSlide();
++ else
++ mxSlideShowController->gotoPreviousEffect();
++ }
++ break;
++
+ case awt::Key::LEFT:
+ case awt::Key::UP:
+ case awt::Key::P:
+ case awt::Key::BACKSPACE:
+ if (mxSlideShowController.is())
+ {
+- mxSlideShowController->gotoPreviousSlide();
++ mxSlideShowController->gotoPreviousEffect();
+ }
+ break;
+
+diff --git sdext/source/presenter/PresenterCurrentSlideObserver.cxx sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+index 8f587c5..87abc55 100644
+--- sdext/source/presenter/PresenterCurrentSlideObserver.cxx
++++ sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+@@ -109,13 +109,13 @@ void SAL_CALL PresenterCurrentSlideObserver::resumed (void)
+ {
+ }
+
+-void SAL_CALL PresenterCurrentSlideObserver::slideEnded (void)
++void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse)
+ throw (css::uno::RuntimeException)
+ {
+ // Determine whether the new current slide (the one after the one that
+ // just ended) is the slide past the last slide in the presentation,
+ // i.e. the one that says something like "click to end presentation...".
+- if (mxSlideShowController.is())
++ if (mxSlideShowController.is() && !bReverse)
+ if (mxSlideShowController->getNextSlideIndex() < 0)
+ if( mpPresenterController.is() )
+ mpPresenterController->UpdateCurrentSlide(+1);
+diff --git sdext/source/presenter/PresenterCurrentSlideObserver.hxx sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+index 8775c50..8608b52 100644
+--- sdext/source/presenter/PresenterCurrentSlideObserver.hxx
++++ sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+@@ -76,7 +76,7 @@ public:
+ virtual void SAL_CALL slideTransitionStarted( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException);
+- virtual void SAL_CALL slideEnded( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL hyperLinkClicked( const ::rtl::OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException);
+
+ // XAnimationListener
+diff --git sdext/source/presenter/description.xml sdext/source/presenter/description.xml
+index c00b8f0..35e2acc 100644
+--- sdext/source/presenter/description.xml
++++ sdext/source/presenter/description.xml
+@@ -8,10 +8,10 @@
+ <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
+
+ <dependencies>
+- <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
++ <OpenOffice.org-minimal-version value="3.1" dep:name="OpenOffice.org 3.2"/>
+ </dependencies>
+
+- <version value="1.0.2" />
++ <version value="1.1.0" />
+
+ <platform value="UPDATED_PLATFORM" />
+
diff --git a/patches/dev300/slideshow-effect-rewind-sdext.diff b/patches/dev300/slideshow-effect-rewind-sdext.diff
index be134d6..507ef49 100644
--- a/patches/dev300/slideshow-effect-rewind-sdext.diff
+++ b/patches/dev300/slideshow-effect-rewind-sdext.diff
@@ -39,9 +39,11 @@ diff --git sdext/source/presenter/PresenterController.cxx sdext/source/presenter
index 9c54364..975b116 100644
--- sdext/source/presenter/PresenterController.cxx
+++ sdext/source/presenter/PresenterController.cxx
-@@ -918,13 +918,22 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
+@@ -1002,14 +1002,23 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
+ }
break;
+- case awt::Key::LEFT:
case awt::Key::PAGEUP:
+ if (mxSlideShowController.is())
+ {
@@ -52,7 +54,7 @@ index 9c54364..975b116 100644
+ }
+ break;
+
- case awt::Key::LEFT:
++ case awt::Key::LEFT:
case awt::Key::UP:
case awt::Key::P:
case awt::Key::BACKSPACE:
More information about the ooo-build-commit
mailing list