summaryrefslogtreecommitdiff
path: root/sd/source/ui/remotecontrol
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-25 19:10:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-26 11:01:43 +0200
commitb59b4a38b45e1bf158701355c8c70f1c59f3e112 (patch)
treee40ff4daa9acec5031a28453ad8686bd6267b024 /sd/source/ui/remotecontrol
parent742f030d67f3d4179d3d0153cc16be35095eb580 (diff)
loplugin:oncevar in sd
Change-Id: I56649b4df8c517f152ed4e9132985bbef22f8634 Reviewed-on: https://gerrit.libreoffice.org/39241 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/remotecontrol')
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.cxx3
-rw-r--r--sd/source/ui/remotecontrol/Receiver.cxx3
2 files changed, 2 insertions, 4 deletions
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index c5ad4e20d18c..2b01b046d381 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -888,7 +888,6 @@ DBusHandlerResult ProfileMessageFunction
(DBusConnection *pConnection, DBusMessage *pMessage, void *user_data)
{
SAL_INFO("sdremote.bluetooth", "ProfileMessageFunction||" << dbus_message_get_interface(pMessage) << "||" << dbus_message_get_member(pMessage));
- DBusHandlerResult aRet = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
if (OString(dbus_message_get_interface(pMessage)).equals("org.bluez.Profile1"))
{
@@ -953,7 +952,7 @@ DBusHandlerResult ProfileMessageFunction
}
}
SAL_WARN("sdremote.bluetooth", "Couldn't handle message correctly.");
- return aRet;
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx
index 9d24a6cf006b..3fd6d9a1a9fe 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -113,7 +113,6 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
}
else if ( aCommand[0].equals( "presentation_blank_screen" ) )
{
- sal_Int32 aColour = 0; // Default is black
if ( aCommand.size() > 1 )
{
// aColour = FIXME: get the colour in some format from this string
@@ -121,7 +120,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
}
if ( xSlideShowController.is() )
{
- xSlideShowController->blankScreen( aColour );
+ xSlideShowController->blankScreen( 0 ); // Default is black
}
}
else if (aCommand[0].equals( "pointer_started" ))