[Libreoffice-commits] core.git: 2 commits - sd/source

[Michael Meeks]

 sd/source/ui/remotecontrol/Communicator.cxx |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 3edc4b8aab3d07019592c92eb278d2f016679902
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Oct 2 12:57:30 2013 +0100

    sdremote: simplify version string creation.
    
    Change-Id: I764d857679bdaafd40a46c80c461d787c6da144a

diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index c9954e2..d8e0813 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -57,10 +57,7 @@ void Communicator::execute()
                               Transmitter::PRIORITY_HIGH );
 
     OStringBuffer aServerInformationBuffer;
-    aServerInformationBuffer
-      .append( "LO_SERVER_INFO\n" )
-      .append( OUStringToOString( OUString::createFromAscii( LIBO_VERSION_DOTTED ), RTL_TEXTENCODING_UTF8 ) )
-      .append("\n\n");
+    aServerInformationBuffer.append( "LO_SERVER_INFO\n" LIBO_VERSION_DOTTED "\n\n" );
 
     pTransmitter->addMessage( aServerInformationBuffer.makeStringAndClear(), Transmitter::PRIORITY_HIGH );
 
commit 7488c72023dedd38eade901a8686044ff6ea525a
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date:   Sat Sep 21 17:24:45 2013 +0300

    Add sending server information after pairing.
    
    Basically it is only version at moment. Should be helpful for protocol
    versioning.
    
    Change-Id: I57fd5d73f783c32393c0b3fb9a4573cb6852060e

diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx
index 775d721..c9954e2 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -13,6 +13,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/mediadescriptor.hxx>
+#include <config_version.h>
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
 
@@ -54,6 +55,15 @@ void Communicator::execute()
 
     pTransmitter->addMessage( "LO_SERVER_SERVER_PAIRED\n\n",
                               Transmitter::PRIORITY_HIGH );
+
+    OStringBuffer aServerInformationBuffer;
+    aServerInformationBuffer
+      .append( "LO_SERVER_INFO\n" )
+      .append( OUStringToOString( OUString::createFromAscii( LIBO_VERSION_DOTTED ), RTL_TEXTENCODING_UTF8 ) )
+      .append("\n\n");
+
+    pTransmitter->addMessage( aServerInformationBuffer.makeStringAndClear(), Transmitter::PRIORITY_HIGH );
+
     Receiver aReceiver( pTransmitter );
     try {
         uno::Reference< frame::XDesktop2 > xFramesSupplier = frame::Desktop::create( ::comphelper::getProcessComponentContext() );
@@ -76,9 +86,10 @@ void Communicator::execute()
         }
 
         OStringBuffer aBuffer;
-            aBuffer.append( "slideshow_info\n" )
-                .append( OUStringToOString( ::comphelper::DocumentInfo::getDocumentTitle( xFrame->getController()->getModel() ), RTL_TEXTENCODING_UTF8 ) )
-               .append("\n\n");
+        aBuffer
+          .append( "slideshow_info\n" )
+          .append( OUStringToOString( ::comphelper::DocumentInfo::getDocumentTitle( xFrame->getController()->getModel() ), RTL_TEXTENCODING_UTF8 ) )
+          .append("\n\n");
 
         pTransmitter->addMessage( aBuffer.makeStringAndClear(), Transmitter::PRIORITY_LOW );
     }