Skip to content

C
core
Kaydet (Commit) 61686edf authored tarafından Artur Dryomov's avatar Artur Dryomov Kaydeden (comit) Michael Meeks
Dosyalara gözat
Seçenekler

fdo#60604 - fix Impress remote client speaker notes encoding 

There is nothing wrong with the current code, it is the Android’s
problem.

Issue was reported upstream:
https://code.google.com/p/android/issues/detail?id=1733#c23

Tested on Jelly Bean 4.2 and russian speaker notes.

Reviewed-on: https://gerrit.libreoffice.org/2723Reviewed-by: 's avatarThorsten Behrens <tbehrens@suse.com>
Tested-by: 's avatarThorsten Behrens <tbehrens@suse.com>

Conflicts:

	android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java

Change-Id: I85414abac233186484078637073b97562b81aad2
Signed-off-by: 's avatarMichael Meeks <michael.meeks@suse.com>
üst 0bd9229f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
Dosyayı görüntüle @ 61686edf
......@@ -100,7 +100,7 @@ public class PresentationFragment extends SherlockFragment {
mNotes = (WebView) v.findViewById(R.id.presentation_notes);
String summary = "<html><body>This is just a test<br/><ul><li>And item</li><li>And again</li></ul>More text<br/>Blabla<br/>Blabla<br/>blabla<br/>Blabla</body></html>";
mNotes.loadData(summary, "text/html", null);
mNotes.loadDataWithBaseURL(null, summary, "text/html", "UTF-8", null);
mNotes.setBackgroundColor(Color.TRANSPARENT);
mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow);
......@@ -156,8 +156,8 @@ public class PresentationFragment extends SherlockFragment {
// int aSlide = mCommunicationService.getSlideShow().getCurrentSlide();
mNumberText.setText((aPosition + 1) + "/"
+ mCommunicationService.getSlideShow().getSize());
mNotes.loadData(mCommunicationService.getSlideShow()
.getNotes(aPosition), "text/html", null);
mNotes.loadDataWithBaseURL(null, mCommunicationService.getSlideShow()
.getNotes(aPosition), "text/html", "UTF-8", null);
}
// -------------------------------------------------- RESIZING LISTENER ----
......@@ -281,8 +281,8 @@ public class PresentationFragment extends SherlockFragment {
CommunicationService.MSG_SLIDE_NOTES)) {
int aPosition = aIntent.getExtras().getInt("slide_number");
if ( aPosition == mTopView.getSelectedItemPosition() ) {
mNotes.loadData(mCommunicationService.getSlideShow()
.getNotes(aPosition), "text/html", null);
mNotes.loadDataWithBaseURL(null, mCommunicationService.getSlideShow()
.getNotes(aPosition), "text/html", "UTF-8", null);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment