sd/source/ui/slideshow/slideshow.cxx | 12 ++++++++++++
1 file changed, 12 insertions(+)
New commits:
commit d543cb25e16b1f80d0b2826dc1046ba752199e81
Author: Armin Le Grand <armin.le.gr...@me.com>
Date: Thu Sep 22 17:33:48 2011 +0200
Fix #i118456# make sure TextEdit changes get pushed to model
(cherry-picked from http://svn.apache.org/viewvc?rev=1174130&view=rev)
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index 464aa4f..28282ed 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();
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
