summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-03-11 10:28:51 +0000
committerMichael Meeks <michael.meeks@suse.com>2013-03-11 10:30:36 +0000
commitb5e6c7d278abd618ce79a7e0a37bda176bd65619 (patch)
tree4a6264b831f0cb2ff66d09a7a38b290ab2ed0e9b /android
parentb3c81cb3aa81fe00be78ee5c247e0addd3635fa7 (diff)
fdo#60604 - tag notes text as UTF-8.
Change-Id: I535cdae8c742e5b260d73bd000f9354cfe04b854
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index bb24d40a7ced..60e16a3ada30 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -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.loadData(summary, "text/html", "UTF-8");
mNotes.setBackgroundColor(Color.TRANSPARENT);
mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow);
@@ -157,7 +157,7 @@ public class PresentationFragment extends SherlockFragment {
mNumberText.setText((aPosition + 1) + "/"
+ mCommunicationService.getSlideShow().getSize());
mNotes.loadData(mCommunicationService.getSlideShow()
- .getNotes(aPosition), "text/html", null);
+ .getNotes(aPosition), "text/html", "UTF-8");
}
// -------------------------------------------------- RESIZING LISTENER ----
@@ -282,7 +282,7 @@ public class PresentationFragment extends SherlockFragment {
int aPosition = aIntent.getExtras().getInt("slide_number");
if ( aPosition == mTopView.getSelectedItemPosition() ) {
mNotes.loadData(mCommunicationService.getSlideShow()
- .getNotes(aPosition), "text/html", null);
+ .getNotes(aPosition), "text/html", "UTF-8");
}
}