diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-05 11:22:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-05 11:36:20 +0000 |
| commit | 9cd24ca96340506e5ecd028e3a8d37de17aae3e9 (patch) | |
| tree | e20d63bd2fbd1ed720ca7c0dc2b3f39c858ca5b5 /sd | |
| parent | 0966c344b48991820dddce4e47f01752e82e195b (diff) | |
crashtesting: old files using StartWithNavigator fail to load
regression from...
commit 2503a1e99df463aef1bf87c94b7b4a8ee3554efe
Date: Wed Jan 27 12:19:28 2016 -0500
tdf#96414 Remove showing navigator during slideshow
This isn't very user-friendly and the presenter console
does a much better job of this.
Change-Id: I10bec1bcd2305524446a20a34494c265330e4c10
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/data/odp/pass/ooo56974-1.odp | bin | 0 -> 11326 bytes | |||
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sd/qa/unit/data/odp/pass/ooo56974-1.odp b/sd/qa/unit/data/odp/pass/ooo56974-1.odp Binary files differnew file mode 100644 index 000000000000..6a48db41a1fe --- /dev/null +++ b/sd/qa/unit/data/odp/pass/ooo56974-1.odp diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index e787f0395d01..99b27e080309 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -116,6 +116,7 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() { OUString("IsShowLogo"), ATTR_PRESENT_SHOW_PAUSELOGO, cppu::UnoType<bool>::get(), 0, 0 }, { OUString("IsTransitionOnClick"), ATTR_PRESENT_CHANGE_PAGE, cppu::UnoType<bool>::get(), 0, 0 }, { OUString("Pause"), ATTR_PRESENT_PAUSE_TIMEOUT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, + { OUString("StartWithNavigator"), ATTR_PRESENT_NAVIGATOR, cppu::UnoType<bool>::get(), 0, 0 }, { OUString("UsePen"), ATTR_PRESENT_PEN, cppu::UnoType<bool>::get(), 0, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -439,6 +440,10 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const } break; } + case ATTR_PRESENT_NAVIGATOR: + bIllegalArgument = false; + //ignored, but exists in some older documents + break; case ATTR_PRESENT_PEN: { bool bVal = false; @@ -561,6 +566,8 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U return Any( rPresSettings.mbMouseVisible ); case ATTR_PRESENT_ALWAYS_ON_TOP: return Any( rPresSettings.mbAlwaysOnTop ); + case ATTR_PRESENT_NAVIGATOR: + return Any( sal_False ); case ATTR_PRESENT_PEN: return Any( rPresSettings.mbMouseAsPen ); case ATTR_PRESENT_PAUSE_TIMEOUT: |