summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2011-09-22 12:38:57 +0000
committerHerbert Dürr <hdu@apache.org>2011-09-22 12:38:57 +0000
commiteba5cbdb561a8969c90aaba924816eaeda0015dd (patch)
treeffa52f3dc080d69c661c19c3de57701c4c860e57 /sd
parent396616c13681fb5bc4e9f7f219becb4f80e04db3 (diff)
#i118456# make sure TextEdit changes get pushed to model (author=alg)
Diffstat (limited to 'sd')
-rwxr-xr-xsd/source/ui/slideshow/slideshow.cxx12
1 files changed, 12 insertions, 0 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 0f01f0658cbb..7bee71e35014 100755
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -877,6 +877,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();