提交 0730c608 编写于 作者: S Serge Rider 提交者: GitHub

Merge pull request #12407 from dbeaver/find-replace-unformatted-values#12257

#12257 Use non-formatted cell values during search

Former-commit-id: 569f61ec
......@@ -312,7 +312,7 @@ class SpreadsheetFindReplaceTarget implements IFindReplaceTarget, IFindReplaceTa
} else {
GridCell cell = spreadsheet.posToCell(curPosition);
if (cell != null) {
cellText = CommonUtils.toString(spreadsheet.getContentProvider().getCellValue(cell.col, cell.row, true, true));
cellText = CommonUtils.toString(spreadsheet.getContentProvider().getCellValue(cell.col, cell.row, false, false));
} else {
continue;
}
......
......@@ -1986,7 +1986,7 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
if (!hasScope || inScope) {
java.util.regex.Pattern searchPattern = findReplaceTarget.getSearchPattern();
if (searchPattern != null) {
String cellText = getCellText(colElement, rowElement);
String cellText = CommonUtils.toString(getCellValue(colElement, rowElement, false, false));
if (searchPattern.matcher(cellText).find()) {
return backgroundMatched;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册