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

1 files changed, 29 insertions, 28 deletions

diff --git a/khtml/css/cssproperties.h b/khtml/css/cssproperties.h
index 29f7d375b..be92d93d4 100644
--- a/khtml/css/cssproperties.h
+++ b/khtml/css/cssproperties.h
@@ -109,35 +109,36 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
 #define CSS_PROP_WHITE_SPACE 99
 #define CSS_PROP_WIDOWS 100
 #define CSS_PROP_WIDTH 101
-#define CSS_PROP_WORD_SPACING 102
-#define CSS_PROP_Z_INDEX 103
-#define CSS_PROP_BACKGROUND 104
-#define CSS_PROP_BORDER 105
-#define CSS_PROP_BORDER_COLOR 106
-#define CSS_PROP_BORDER_STYLE 107
-#define CSS_PROP_BORDER_TOP 108
-#define CSS_PROP_BORDER_RIGHT 109
-#define CSS_PROP_BORDER_BOTTOM 110
-#define CSS_PROP_BORDER_LEFT 111
-#define CSS_PROP_BORDER_WIDTH 112
-#define CSS_PROP_BOX_SIZING 113
-#define CSS_PROP_FONT 114
-#define CSS_PROP_LIST_STYLE 115
-#define CSS_PROP_MARGIN 116
-#define CSS_PROP_OUTLINE 117
-#define CSS_PROP_PADDING 118
-#define CSS_PROP_SCROLLBAR_BASE_COLOR 119
-#define CSS_PROP_SCROLLBAR_FACE_COLOR 120
-#define CSS_PROP_SCROLLBAR_SHADOW_COLOR 121
-#define CSS_PROP_SCROLLBAR_HIGHLIGHT_COLOR 122
-#define CSS_PROP_SCROLLBAR_3DLIGHT_COLOR 123
-#define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 124
-#define CSS_PROP_SCROLLBAR_TRACK_COLOR 125
-#define CSS_PROP_SCROLLBAR_ARROW_COLOR 126
-#define CSS_PROP__KHTML_FLOW_MODE 127
-#define CSS_PROP__KHTML_USER_INPUT 128
+#define CSS_PROP_WORD_WRAP 102
+#define CSS_PROP_WORD_SPACING 103
+#define CSS_PROP_Z_INDEX 104
+#define CSS_PROP_BACKGROUND 105
+#define CSS_PROP_BORDER 106
+#define CSS_PROP_BORDER_COLOR 107
+#define CSS_PROP_BORDER_STYLE 108
+#define CSS_PROP_BORDER_TOP 109
+#define CSS_PROP_BORDER_RIGHT 110
+#define CSS_PROP_BORDER_BOTTOM 111
+#define CSS_PROP_BORDER_LEFT 112
+#define CSS_PROP_BORDER_WIDTH 113
+#define CSS_PROP_BOX_SIZING 114
+#define CSS_PROP_FONT 115
+#define CSS_PROP_LIST_STYLE 116
+#define CSS_PROP_MARGIN 117
+#define CSS_PROP_OUTLINE 118
+#define CSS_PROP_PADDING 119
+#define CSS_PROP_SCROLLBAR_BASE_COLOR 120
+#define CSS_PROP_SCROLLBAR_FACE_COLOR 121
+#define CSS_PROP_SCROLLBAR_SHADOW_COLOR 122
+#define CSS_PROP_SCROLLBAR_HIGHLIGHT_COLOR 123
+#define CSS_PROP_SCROLLBAR_3DLIGHT_COLOR 124
+#define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 125
+#define CSS_PROP_SCROLLBAR_TRACK_COLOR 126
+#define CSS_PROP_SCROLLBAR_ARROW_COLOR 127
+#define CSS_PROP__KHTML_FLOW_MODE 128
+#define CSS_PROP__KHTML_USER_INPUT 129
 
 #define CSS_PROP_MAX CSS_PROP_Z_INDEX
-#define CSS_PROP_TOTAL 129
+#define CSS_PROP_TOTAL 130
 #endif