[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - android/sdremote

Thu Mar 14 06:40:54 PDT 2013

android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 61686edf7074ab72d03ca2f73022797443a61fa9
Author: Artur Dryomov <artur.dryomov at gmail.com>
Date:   Thu Mar 14 14:25:55 2013 +0300

    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/2723
    Reviewed-by: Thorsten Behrens <tbehrens at suse.com>
    Tested-by: Thorsten Behrens <tbehrens at suse.com>
    
    Conflicts:
    
    	android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
    
    Change-Id: I85414abac233186484078637073b97562b81aad2
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index bb24d40a7..0aab5a6 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.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);
                 }
             }
 
