summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java9
-rw-r--r--sdext/source/presenter/PresenterController.cxx11
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.cxx4
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.hxx2
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.cxx12
-rw-r--r--sdext/source/presenter/description.xml4
6 files changed, 35 insertions, 7 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
index 44117380e176..e9025330a60f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -98,6 +98,15 @@ public class TableCellLayoutController extends SectionLayoutController
{
return null;
}
+ final Expression dc = element.getDisplayCondition();
+ if (dc != null)
+ {
+ final Object o = LayoutControllerUtil.evaluateExpression(getFlowController(), element, dc);
+ if (Boolean.FALSE.equals(o))
+ {
+ return null;
+ }
+ }
return FormatValueUtility.computeDataFlag(element, getFlowController());
}
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 58f7053cc11c..699df813bb9d 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -1004,12 +1004,21 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
case awt::Key::LEFT:
case awt::Key::PAGEUP:
+ if (mxSlideShowController.is())
+ {
+ if (rEvent.Modifiers == awt::KeyModifier::MOD2)
+ mxSlideShowController->gotoPreviousSlide();
+ else
+ mxSlideShowController->gotoPreviousEffect();
+ }
+ break;
+
case awt::Key::UP:
case awt::Key::P:
case awt::Key::BACKSPACE:
if (mxSlideShowController.is())
{
- mxSlideShowController->gotoPreviousSlide();
+ mxSlideShowController->gotoPreviousEffect();
}
break;
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index 7776cffb0f09..604908ac3254 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/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 a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index e4cbd6fbf19d..7b6f231f0576 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/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 a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 5acf57ff87fd..e0fe026516b8 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -173,7 +173,17 @@ void PresenterSlideShowView::LateInit (void)
// Add the new slide show view to the slide show.
if (mxSlideShow.is() && ! mbIsViewAdded)
{
- mxSlideShow->addView(this);
+ Reference<presentation::XSlideShowView> xView (this);
+ mxSlideShow->addView(xView);
+ // Prevent embeded sounds being played twice at the same time by
+ // disabling sound for the new slide show view.
+ beans::PropertyValue aProperty;
+ aProperty.Name = A2S("IsSoundEnabled");
+ Sequence<Any> aValues (2);
+ aValues[0] <<= xView;
+ aValues[1] <<= sal_False;
+ aProperty.Value <<= aValues;
+ mxSlideShow->setProperty(aProperty);
mbIsViewAdded = true;
}
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index 0289e7514a2e..af1c4fee348e 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -8,7 +8,7 @@
<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.2" dep:name="OpenOffice.org 3.2"/>
</dependencies>
<registration>
@@ -17,7 +17,7 @@
</simple-license>
</registration>
- <version value="1.0.3" />
+ <version value="1.1.0" />
<platform value="UPDATED_PLATFORM" />