From d0abc1a165ce7130e802d892e1417617a99a3ba0 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 3 Sep 2010 17:11:27 +0000
Subject: Merge commit 1170303 from the Enterprise branch

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1171389 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 khtml/css/cssparser.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'khtml/css/cssparser.cpp')

diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
index 1bff45c51..23eeb69a9 100644
--- a/khtml/css/cssparser.cpp
+++ b/khtml/css/cssparser.cpp
@@ -1076,6 +1076,13 @@ bool CSSParser::parseValue( int propId, bool important )
                                     CSS_PROP_LIST_STYLE_IMAGE };
         return parseShortHand(propId, properties, 3, important);
     }
+    case CSS_PROP_WORD_WRAP:
+    {
+        // normal | break-word
+        if ( id == CSS_VAL_NORMAL || id == CSS_VAL_BREAK_WORD )
+            valid_primitive = true;
+        break;
+    }
     default:
 // #ifdef CSS_DEBUG
 //         kdDebug( 6080 ) << "illegal or CSS2 Aural property: " << val << endl;
-- 
cgit v1.2.3