From e667346b6db97b7e36e02108db3b48627981d39a Mon Sep 17 00:00:00 2001 From: gallon Date: Sun, 25 Nov 2018 14:50:17 +0300 Subject: [PATCH 1/2] fixed escaping of {workbook index + sheet name[s]} section in Ref3DPxg/Area3DPxg.toFormulaString() --- .../poi/ss/formula/SheetNameFormatter.java | 11 ++- .../SheetRangeAndWorkbookIndexFormatter.java | 73 +++++++++++++++++++ .../apache/poi/ss/formula/ptg/Area3DPxg.java | 13 +--- .../apache/poi/ss/formula/ptg/Ref3DPxg.java | 16 +--- ...eetRangeAndWorkbookIndexFormatterTest.java | 66 +++++++++++++++++ 5 files changed, 154 insertions(+), 25 deletions(-) create mode 100644 src/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java create mode 100644 src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java diff --git a/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java b/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java index c6e13c31106..6e10e67c584 100644 --- a/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java +++ b/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java @@ -59,6 +59,7 @@ public static String format(String rawSheetName) { * @param rawSheetName - sheet name * @deprecated use appendFormat(StringBuilder out, String rawSheetName) instead */ + @Deprecated public static void appendFormat(StringBuffer out, String rawSheetName) { boolean needsQuotes = needsDelimiting(rawSheetName); if(needsQuotes) { @@ -73,6 +74,7 @@ public static void appendFormat(StringBuffer out, String rawSheetName) { /** * @deprecated use appendFormat(StringBuilder out, String workbookName, String rawSheetName) instead */ + @Deprecated public static void appendFormat(StringBuffer out, String workbookName, String rawSheetName) { boolean needsQuotes = needsDelimiting(workbookName) || needsDelimiting(rawSheetName); if(needsQuotes) { @@ -123,7 +125,7 @@ public static void appendFormat(StringBuilder out, String workbookName, String r } } - private static void appendAndEscape(Appendable sb, String rawSheetName) { + static void appendAndEscape(Appendable sb, String rawSheetName) { int len = rawSheetName.length(); for(int i=0; i= 0) { + sb.append('['); + sb.append(workbookIndex); + sb.append(']'); + } + + SheetNameFormatter.appendAndEscape(sb, firstSheetName); + + if (lastSheetName != null) { + sb.append(':'); + SheetNameFormatter.appendAndEscape(sb, lastSheetName); + } + + sb.append('\''); + return sb.toString(); + } + + private static String formatWithoutDelimiting(StringBuilder sb, int workbookIndex, String firstSheetName, String lastSheetName) { + if (workbookIndex >= 0) { + sb.append('['); + sb.append(workbookIndex); + sb.append(']'); + } + + sb.append(firstSheetName); + + if (lastSheetName != null) { + sb.append(':'); + sb.append(lastSheetName); + } + + return sb.toString(); + } + + private static boolean anySheetNameNeedsEscaping(String firstSheetName, String lastSheetName) { + boolean anySheetNameNeedsDelimiting = firstSheetName != null && SheetNameFormatter.needsDelimiting(firstSheetName); + anySheetNameNeedsDelimiting |= lastSheetName != null && SheetNameFormatter.needsDelimiting(lastSheetName); + return anySheetNameNeedsDelimiting; + } +} diff --git a/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java b/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java index 65f59e83e11..41bea0c950e 100644 --- a/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java +++ b/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java @@ -20,6 +20,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.formula.SheetIdentifier; import org.apache.poi.ss.formula.SheetNameFormatter; +import org.apache.poi.ss.formula.SheetRangeAndWorkbookIndexFormatter; import org.apache.poi.ss.formula.SheetRangeIdentifier; import org.apache.poi.ss.util.AreaReference; import org.apache.poi.util.LittleEndianOutput; @@ -102,16 +103,8 @@ public String format2DRefAsString() { public String toFormulaString() { StringBuilder sb = new StringBuilder(64); - if (externalWorkbookNumber >= 0) { - sb.append('['); - sb.append(externalWorkbookNumber); - sb.append(']'); - } - SheetNameFormatter.appendFormat(sb, firstSheetName); - if (lastSheetName != null) { - sb.append(':'); - SheetNameFormatter.appendFormat(sb, lastSheetName); - } + + SheetRangeAndWorkbookIndexFormatter.format(sb, externalWorkbookNumber, firstSheetName, lastSheetName); sb.append('!'); sb.append(formatReferenceAsString()); return sb.toString(); diff --git a/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java b/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java index 67f73b360dc..12e7e54eda9 100644 --- a/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java +++ b/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java @@ -18,7 +18,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more package org.apache.poi.ss.formula.ptg; import org.apache.poi.ss.formula.SheetIdentifier; -import org.apache.poi.ss.formula.SheetNameFormatter; +import org.apache.poi.ss.formula.SheetRangeAndWorkbookIndexFormatter; import org.apache.poi.ss.formula.SheetRangeIdentifier; import org.apache.poi.ss.util.CellReference; import org.apache.poi.util.LittleEndianOutput; @@ -101,18 +101,8 @@ public String format2DRefAsString() { public String toFormulaString() { StringBuilder sb = new StringBuilder(64); - if (externalWorkbookNumber >= 0) { - sb.append('['); - sb.append(externalWorkbookNumber); - sb.append(']'); - } - if (firstSheetName != null) { - SheetNameFormatter.appendFormat(sb, firstSheetName); - } - if (lastSheetName != null) { - sb.append(':'); - SheetNameFormatter.appendFormat(sb, lastSheetName); - } + + SheetRangeAndWorkbookIndexFormatter.format(sb, externalWorkbookNumber, firstSheetName, lastSheetName); sb.append('!'); sb.append(formatReferenceAsString()); return sb.toString(); diff --git a/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java b/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java new file mode 100644 index 00000000000..dc96d63f213 --- /dev/null +++ b/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java @@ -0,0 +1,66 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + +package org.apache.poi.ss.formula; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class SheetRangeAndWorkbookIndexFormatterTest { + @Test + public void noDelimiting_ifASingleSheetNameDoesntNeedDelimiting() { + StringBuilder sb = new StringBuilder(); + String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "noDelimiting", null); + assertEquals("[0]noDelimiting", result); + } + + @Test + public void everythingIsScreened_ifASingleSheetNameNeedsDelimiting() { + StringBuilder sb = new StringBuilder(); + String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "1delimiting", null); + assertEquals("'[0]1delimiting'", result); + } + + @Test + public void noDelimiting_ifBothSheetNamesDontNeedDelimiting() { + StringBuilder sb = new StringBuilder(); + String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "noDelimiting1", "noDelimiting2"); + assertEquals("[0]noDelimiting1:noDelimiting2", result); + } + + @Test + public void everythingIsScreened_ifFirstSheetNamesNeedsDelimiting() { + StringBuilder sb = new StringBuilder(); + String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "1delimiting", "noDelimiting"); + assertEquals("'[0]1delimiting:noDelimiting'", result); + } + + @Test + public void everythingIsScreened_ifLastSheetNamesNeedsDelimiting() { + StringBuilder sb = new StringBuilder(); + String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "noDelimiting", "1delimiting"); + assertEquals("'[0]noDelimiting:1delimiting'", result); + } + + @Test + public void everythingIsScreened_ifBothSheetNamesNeedDelimiting() { + StringBuilder sb = new StringBuilder(); + String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "1delimiting", "2delimiting"); + assertEquals("'[0]1delimiting:2delimiting'", result); + } +} \ No newline at end of file From d4cbdf700bc5db3f4e400eee7e749dadeff33f28 Mon Sep 17 00:00:00 2001 From: gallon Date: Sun, 25 Nov 2018 14:52:59 +0300 Subject: [PATCH 2/2] +newline at EOF --- .../poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java b/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java index dc96d63f213..43dd236d380 100644 --- a/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java +++ b/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java @@ -63,4 +63,4 @@ public void everythingIsScreened_ifBothSheetNamesNeedDelimiting() { String result = SheetRangeAndWorkbookIndexFormatter.format(sb, 0, "1delimiting", "2delimiting"); assertEquals("'[0]1delimiting:2delimiting'", result); } -} \ No newline at end of file +}