[Libreoffice-commits] core.git: 2 commits - sd/source
Tor Lillqvist
tml at iki.fi
Mon Feb 18 03:18:33 PST 2013
sd/source/ui/remotecontrol/BluetoothServer.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit b008101fd754b6b81c4f31e3079f01a21434601d
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Feb 18 13:14:36 2013 +0200
Plug autorelease leak
Change-Id: I0e1c04547b90279c49851d6a877917d6376b33ef
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index a35fe27..b9736a2 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -597,6 +597,8 @@ void SAL_CALL BluetoothServer::run()
// Compare to BluetoothServiceRecord.hxx
+ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
NSDictionary *dict =
[NSDictionary dictionaryWithObjectsAndKeys:
@@ -700,6 +702,9 @@ void SAL_CALL BluetoothServer::run()
[serviceRecord release];
}
+
+ [pool release];
+
(void) mpCommunicators;
#else
(void) mpCommunicators; // avoid warnings about unused member
commit da3d37b968a79ff59fcc4103174b5b6bc3ec74c0
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Feb 18 12:50:17 2013 +0200
Be specific in the logging as multiple threads involved
Sure, each SAL_INFO output line includes the thread ID, but still,
good to avoid confusion from where this line is coming.
Change-Id: Idc531640e661ed363c7badbad8b83fbb43eaf3ad
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 1062e1c..a35fe27 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -152,7 +152,7 @@ sal_Int32 OSXBluetoothWrapper::readLine( rtl::OString& aLine )
s << *p;
}
}
- SAL_INFO( "sdremote.bluetooth", " mBuffer: \"" << s.str() << "\"" );
+ SAL_INFO( "sdremote.bluetooth", "OSXBluetoothWrapper::readLine mBuffer: \"" << s.str() << "\"" );
#endif
// got enough bytes to return a line?
More information about the Libreoffice-commits
mailing list