diff options
| author | Armin Le Grand <Armin.Le.Grand@me.com> | 2011-09-22 17:33:48 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-09-22 17:44:21 +0200 |
| commit | d543cb25e16b1f80d0b2826dc1046ba752199e81 (patch) | |
| tree | 6e6b1e485197e6bcc8368de6980e2593b0be566c /sd | |
| parent | a993f166d5e5f0565c7ef041d12a491ddf525f45 (diff) | |
Fix #i118456# make sure TextEdit changes get pushed to model
(cherry-picked from http://svn.apache.org/viewvc?rev=1174130&view=rev)
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 464aa4fe76e7..28282ed80559 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -869,6 +869,18 @@ void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rA } } + // #118456# make sure TextEdit changes get pushed to model. + // mpDrawView is tested against NULL above already. + if(mpCurrentViewShellBase) + { + ViewShell* pViewShell = mpCurrentViewShellBase->GetMainViewShell().get(); + + if(pViewShell && pViewShell->GetView()) + { + pViewShell->GetView()->SdrEndTextEdit(); + } + } + // Start either a full-screen or an in-place show. if(mxCurrentSettings->mbFullScreen && !mxCurrentSettings->mbPreview) StartFullscreenPresentation(); |