moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

BUG 60273 -- Use codepageutil to get correct charset in VBAMacroReader

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1765490 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tim Allison 2016-10-18 18:24:39 +00:00
parent ef7bbb8fe4
commit 17d4d76f4f
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
View File

@ -41,6 +41,7 @@ import org.apache.poi.poifs.filesystem.DocumentNode;
import org.apache.poi.poifs.filesystem.Entry; import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
import org.apache.poi.poifs.filesystem.OfficeXmlFileException; import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
import org.apache.poi.util.CodePageUtil;
import org.apache.poi.util.HexDump; import org.apache.poi.util.HexDump;
import org.apache.poi.util.IOUtils; import org.apache.poi.util.IOUtils;
import org.apache.poi.util.RLEDecompressingInputStream; import org.apache.poi.util.RLEDecompressingInputStream;
@ -305,7 +306,7 @@ public class VBAMacroReader implements Closeable {
break; break;
case PROJECTCODEPAGE: case PROJECTCODEPAGE:
int codepage = in.readShort(); int codepage = in.readShort();
modules.charset = Charset.forName("Cp" + codepage); modules.charset = Charset.forName(CodePageUtil.codepageToEncoding(codepage, true));
break; break;
case STREAMNAME: case STREAMNAME:
streamName = readString(in, recordLength, modules.charset); streamName = readString(in, recordLength, modules.charset);

10
src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
View File

@ -272,4 +272,14 @@ public class TestVBAMacroReader {
assertNotNull(macros.get("NewMacros")); assertNotNull(macros.get("NewMacros"));
assertContains(macros.get("NewMacros"), "' dirty"); assertContains(macros.get("NewMacros"), "' dirty");
} }
@Test
public void bug60273() throws IOException {
//test file derives from govdocs1 147240.xls
File f = POIDataSamples.getSpreadSheetInstance().getFile("60273.xls");
VBAMacroReader r = new VBAMacroReader(f);
Map<String, String> macros = r.readMacros();
assertNotNull(macros.get("Module1"));
assertContains(macros.get("Module1"), "9/8/2004");
}
} }

BIN
test-data/spreadsheet/60273.xls Normal file
View File

Binary file not shown.