[PATCH] fdo#60604 - fix Impress remote client speaker notes encoding

"Artur Dryomov (via Code Review)" <gerrit -AT- gerrit.libreoffice.org>
Thu, 14 Mar 2013 11:33:59 +0000

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2723

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/2723/1

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.

Change-Id: I85414abac233186484078637073b97562b81aad2
---
M android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
1 file changed, 5 insertions(+), 5 deletions(-)



diff --git a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
index 60e16a3..0aab5a6 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java
@@ -100,7 +100,7 @@
         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", "UTF-8");
+        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 @@
         //        int aSlide = mCommunicationService.getSlideShow().getCurrentSlide();
         mNumberText.setText((aPosition + 1) + "/"
                         + mCommunicationService.getSlideShow().getSize());
-        mNotes.loadData(mCommunicationService.getSlideShow()
-                        .getNotes(aPosition), "text/html", "UTF-8");
+        mNotes.loadDataWithBaseURL(null, mCommunicationService.getSlideShow()
+                        .getNotes(aPosition), "text/html", "UTF-8", null);
     }
 
     // -------------------------------------------------- RESIZING LISTENER ----
@@ -281,8 +281,8 @@
                             CommunicationService.MSG_SLIDE_NOTES)) {
                 int aPosition = aIntent.getExtras().getInt("slide_number");
                 if ( aPosition == mTopView.getSelectedItemPosition() ) {
-                    mNotes.loadData(mCommunicationService.getSlideShow()
-                                    .getNotes(aPosition), "text/html", "UTF-8");
+                    mNotes.loadDataWithBaseURL(null, mCommunicationService.getSlideShow()
+                                    .getNotes(aPosition), "text/html", "UTF-8", null);
                 }
             }
 

-- 
To view, visit https://gerrit.libreoffice.org/2723
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85414abac233186484078637073b97562b81aad2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Artur Dryomov <artur.dryomov@gmail.com>

Context

[PATCH] fdo#60604 - fix Impress remote client speaker notes encoding · Artur Dryomov (via Code Review)
- [PUSHED] fdo#60604 - fix Impress remote client speaker notes encoding · Thorsten Behrens (via Code Review)

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.