From 9364f22aed35e1a1e9d07c121510f80be3ab0502 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 21 Oct 2008 07:00:00 -0700 Subject: Initial Contribution --- WebCore/editing/htmlediting.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'WebCore/editing/htmlediting.cpp') diff --git a/WebCore/editing/htmlediting.cpp b/WebCore/editing/htmlediting.cpp index c2d1fb5..a8d7702 100644 --- a/WebCore/editing/htmlediting.cpp +++ b/WebCore/editing/htmlediting.cpp @@ -367,11 +367,11 @@ int maxDeepOffset(const Node *node) String stringWithRebalancedWhitespace(const String& string, bool startIsStartOfParagraph, bool endIsEndOfParagraph) { - static String twoSpaces(" "); - static String nbsp("\xa0"); - static String pattern(" \xa0"); + static DeprecatedString twoSpaces(" "); + static DeprecatedString nbsp("\xa0"); + static DeprecatedString pattern(" \xa0"); - String rebalancedString = string; + DeprecatedString rebalancedString = string.deprecatedString(); rebalancedString.replace(noBreakSpace, ' '); rebalancedString.replace('\n', ' '); @@ -385,7 +385,7 @@ String stringWithRebalancedWhitespace(const String& string, bool startIsStartOfP if (endIsEndOfParagraph && rebalancedString[end] == ' ') rebalancedString.replace(end, 1, nbsp); - return rebalancedString; + return String(rebalancedString); } bool isTableStructureNode(const Node *node) -- cgit v1.1