[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sd/source
Hochwasser (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jul 13 14:44:24 UTC 2021
sd/source/ui/remotecontrol/Communicator.cxx | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 8fe92ee041a38e3e2057ba0287ef60845e2faa34
Author: Hochwasser <oo.o+libreoffice at windbuechse.samba-tng.org>
AuthorDate: Thu Sep 17 09:08:00 2020 +0100
Commit: Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Jul 13 16:43:48 2021 +0200
tdf#119312 Crash in: sdext::presenter::PresenterSlideShowView::LateInit()
Change-Id: I8c2eda406d8266996eaf023072cc7f4f38edc4a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102902
Tested-by: Jenkins
Tested-by: Andrzej Hunt <andrzej at ahunt.org>
Reviewed-by: Andrzej Hunt <andrzej at ahunt.org>
(cherry picked from commit dabb1dc347071abb7d6a708930f5fbdb8c68c72a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118719
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index de55f38f8514..3d24f1714307 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -75,19 +75,18 @@ void Communicator::execute()
if ( xPresentation.is() && xPresentation->isRunning() )
{
presentationStarted( xPresentation->getController() );
+ OString aBuffer =
+ "slideshow_info\n" +
+ OUStringToOString( ::comphelper::DocumentInfo::getDocumentTitle( xFrame->getController()->getModel() ), RTL_TEXTENCODING_UTF8 ) +
+ "\n\n";
+
+ pTransmitter->addMessage( aBuffer.getStr(), Transmitter::PRIORITY_LOW );
}
else
{
pTransmitter->addMessage( "slideshow_finished\n\n",
Transmitter::PRIORITY_HIGH );
}
-
- OString aBuffer =
- "slideshow_info\n" +
- OUStringToOString( ::comphelper::DocumentInfo::getDocumentTitle( xFrame->getController()->getModel() ), RTL_TEXTENCODING_UTF8 ) +
- "\n\n";
-
- pTransmitter->addMessage( aBuffer.getStr(), Transmitter::PRIORITY_LOW );
}
catch (uno::RuntimeException &)
{
More information about the Libreoffice-commits
mailing list