mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notes export now working.

Browse Source 
Change-Id: I025c3e6421614c68ea76c9b8afd351abca8b6fad
This commit is contained in:
Andrzej J.R. Hunt
2012-07-30 09:25:18 +02:00
committed by Michael Meeks
parent 191985e3e5
commit 0c1f4762ca
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/sdremote/src/org/libreoffice/impressremote/TestClient.java
View File

@@ -58,7 +58,6 @@ public class TestClient extends Activity {
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
// doUnbindService();
} }
@Override @Override
@@ -66,6 +65,7 @@ public class TestClient extends Activity {
// TODO Auto-generated method stub // TODO Auto-generated method stub
mCommunicationService.disconnect(); mCommunicationService.disconnect();
stopService(new Intent(this, CommunicationService.class)); stopService(new Intent(this, CommunicationService.class));
doUnbindService();
finish(); finish();
super.onBackPressed(); super.onBackPressed();
} }

26
sd/source/ui/remotecontrol/ImagePreparer.cxx
View File

@@ -184,8 +184,32 @@ uno::Sequence<sal_Int8> ImagePreparer::preparePreview(
void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber ) void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
{ {
OString aOut = prepareNotes( aSlideNumber ); OString aNotes = prepareNotes( aSlideNumber );
if ( aNotes.getLength() == 0 )
return;
// OUStringBuffer aStrBuffer;
// ::sax::Converter::encodeBase64( aStrBuffer, aTemp );
//
// OString aNotes = OUStringToOString(
// aStrBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
if ( !xController->isRunning() )
return;
// Start the writing
OStringBuffer aBuffer;
aBuffer.append( "slide_notes\n" );
aBuffer.append( OString::valueOf( sal_Int32( aSlideNumber ) ).getStr() );
aBuffer.append( "\n" );
aBuffer.append( aNotes );
aBuffer.append( "\n\n" );
pTransmitter->addMessage( aBuffer.makeStringAndClear(),
Transmitter::Priority::LOW );
} }