litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Replaced Robert Harder's base 64 class with javax.xml.bind.DatatypeConverter

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@188 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2014-10-27 07:40:10 +00:00
parent de72a4f49e
commit d2b20d20c9
4 changed files with 5 additions and 1818 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/distro/changelog.txt
View file

@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6
---------- version 1.5.1 ---------- ---------- version 1.5.1 ----------
[all] Implementation detail: Replaced Robert Harder's base 64 class with javax.xml.bind.DatatypeConverter
[w2x] Style maps for paragraphs and headings now support the attributes before and after. These define fixed texts [w2x] Style maps for paragraphs and headings now support the attributes before and after. These define fixed texts
to add before/after the content. (This is similar to the pseudo-elements ::before and ::after in CSS.) to add before/after the content. (This is similar to the pseudo-elements ::before and ::after in CSS.)

6
source/java/writer2latex/base/ImageConverter.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.4 (2014-09-24) * Version 1.6 (2014-10-27)
* *
*/ */
@ -47,7 +47,6 @@ import writer2latex.office.MIMETypes;
import writer2latex.office.OfficeReader; import writer2latex.office.OfficeReader;
import writer2latex.office.SVMReader; import writer2latex.office.SVMReader;
import writer2latex.office.XMLString; import writer2latex.office.XMLString;
import writer2latex.util.Base64;
import writer2latex.util.Misc; import writer2latex.util.Misc;
/** This class extracts and converts images from an office document. /** This class extracts and converts images from an office document.
@ -250,7 +249,8 @@ public final class ImageConverter {
buf.append(nl.item(i).getNodeValue()); buf.append(nl.item(i).getNodeValue());
} }
} }
blob = Base64.decode(buf.toString()); //blob = Base64.decode(buf.toString());
blob = DatatypeConverter.parseBase64Binary(buf.toString());
// We may have seen this image before, return the recycled version // We may have seen this image before, return the recycled version
String sId1 = createId(blob); String sId1 = createId(blob);
if (recycledImages.containsKey(sId1)) { if (recycledImages.containsKey(sId1)) {

1811
source/java/writer2latex/util/Base64.java
View file

File diff suppressed because it is too large Load diff

4
source/readme-source.txt
View file

@ -45,10 +45,6 @@ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
From iharder.sourceforge.net:
The class writer2latex.util.Base64 is Robert Harders public domain Base64 class
Building Writer2LaTeX Building Writer2LaTeX
--------------------- ---------------------