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

[Michael Meeks]

 android/experimental/DocumentLoader/native-code.cxx      |    2 --
 android/experimental/LibreOffice4Android/native-code.cxx |    2 --
 android/experimental/desktop/native-code.cxx             |    2 --
 sd/source/ui/remotecontrol/Listener.cxx                  |    3 +--
 sd/source/ui/remotecontrol/Transmitter.cxx               |    4 ++--
 5 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit abacc389db8c7e2bde00cace7292d6259e4c8e6a
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Apr 30 13:19:25 2013 +0100

    android: remove lotus word pro filter - bit optimistic.
    
    Change-Id: I08bbec95db2ae9bc7226cd5ca1cc7b81c235a26f

diff --git a/android/experimental/DocumentLoader/native-code.cxx b/android/experimental/DocumentLoader/native-code.cxx
index 985a0c0..3961e00 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -26,7 +26,6 @@ extern "C"
     extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * protocolhandler_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * sb_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -74,7 +73,6 @@ lo_get_libmap(void)
         { "libhyphenlo.a", hyphen_component_getFactory },
         { "liblnglo.a", lng_component_getFactory },
         { "liblnthlo.a", lnth_component_getFactory },
-        { "liblwpftlo.a", lotuswordpro_component_getFactory },
         { "libooxlo.a", oox_component_getFactory },
         { "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
         { "libscdlo.a", scd_component_getFactory },
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx
index 530e6ee..aebe61b 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -34,7 +34,6 @@ extern "C"
     extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * protocolhandler_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * sb_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -101,7 +100,6 @@ lo_get_libmap(void)
         { "libhyphenlo.a", hyphen_component_getFactory },
         { "liblnglo.a", lng_component_getFactory },
         { "liblnthlo.a", lnth_component_getFactory },
-        { "liblwpftlo.a", lotuswordpro_component_getFactory },
         { "libooxlo.a", oox_component_getFactory },
         { "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
         { "libscdlo.a", scd_component_getFactory },
diff --git a/android/experimental/desktop/native-code.cxx b/android/experimental/desktop/native-code.cxx
index d75f426..b4b71b0 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -35,7 +35,6 @@ extern "C"
     extern void * hyphen_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * lng_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * lnth_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
-    extern void * lotuswordpro_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * protocolhandler_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * oox_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
     extern void * sb_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -106,7 +105,6 @@ lo_get_libmap(void)
         { "libhyphenlo.a", hyphen_component_getFactory },
         { "liblnglo.a", lng_component_getFactory },
         { "liblnthlo.a", lnth_component_getFactory },
-        { "liblwpftlo.a", lotuswordpro_component_getFactory },
         { "libooxlo.a", oox_component_getFactory },
         { "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
         { "libscdlo.a", scd_component_getFactory },
commit a06afd68edede3fd9de6f99466ee9c87aff941af
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Apr 25 14:55:37 2013 +0100

    sdremote: protcol debug for send to match that for recv.
    
    Change-Id: If2840336513772238ec43a9859d47a6e2a315e05

diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index 67259d7..41e1dd6 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -63,13 +63,13 @@ void Listener::init( const css::uno::Reference< css::presentation::XSlideShowCon
 }
 
 //----- XAnimationListener ----------------------------------------------------
+
 void SAL_CALL Listener::beginEvent(const css::uno::Reference<
     css::animations::XAnimationNode >&  rNode ) throw (css::uno::RuntimeException)
 {
     (void) rNode;
 }
 
-
 void SAL_CALL Listener::endEvent( const css::uno::Reference<
     css::animations::XAnimationNode >& rNode ) throw (css::uno::RuntimeException)
 {
@@ -84,7 +84,6 @@ void SAL_CALL Listener::repeat( const css::uno::Reference<
     (void) aRepeat;
 }
 
-
 //----- XSlideShowListener ----------------------------------------------------
 
 void SAL_CALL Listener::paused (void)
diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx b/sd/source/ui/remotecontrol/Transmitter.cxx
index f5861e4..cc7b8ec 100644
--- a/sd/source/ui/remotecontrol/Transmitter.cxx
+++ b/sd/source/ui/remotecontrol/Transmitter.cxx
@@ -36,12 +36,14 @@ void SAL_CALL Transmitter::run()
         {
             OString aMessage( mHighPriority.front() );
             mHighPriority.pop();
+            SAL_INFO( "sdremote.bluetooth", "write high prio line '" << aMessage << "'" );
             pStreamSocket->write( aMessage.getStr(), aMessage.getLength() );
         }
         else if ( !mLowPriority.empty() )
         {
             OString aMessage( mLowPriority.front() );
             mLowPriority.pop();
+            SAL_INFO( "sdremote.bluetooth", "write normal line '" << aMessage << "'" );
             pStreamSocket->write( aMessage.getStr(), aMessage.getLength() );
         }
 
@@ -50,7 +52,6 @@ void SAL_CALL Transmitter::run()
             mQueuesNotEmpty.reset();
         }
     }
-
 }
 
 void Transmitter::notifyFinished()
@@ -61,7 +62,6 @@ void Transmitter::notifyFinished()
 
 Transmitter::~Transmitter()
 {
-
 }
 
 void Transmitter::addMessage( const OString& aMessage, const Priority aPriority )