Resolves: #i119612# fix the order of Hebraic string are changed after..

save as new .doc

* when opening .doc in AOO, preserve the RTL property(property ID is 0x085A)
and export.

Reported by: Lou Qing le
Patch by: Chen Zuo Jun
Review by: Lei De Bin
(cherry picked from commit daa4da26a7ba0c58c79af69fc6624729f7b22c10)

Conflicts:
sw/inc/hintids.hxx
sw/source/core/bastyp/init.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/text/atrstck.cxx
sw/source/filter/ww8/ww8atr.cxx

Change-Id: I2a1788452475e0deebf530aae41e543eae3cd45d

Resolves: #i120935# Insert blank entry for RES_CHRATR_BIDITRL...

and RES_CHRATR_IDCTHINT, to keep the identical res order

(cherry picked from commit 919e99308395c572a7298e6db2b96df8bf7ec3fd)

Conflicts:
sw/source/filter/html/htmlatr.cxx

Change-Id: I3c2a3513de3c146ece583ff40bf3ffb3845f971c

Resolves: #i122867# HTML export - correct function pointer table...

which holds the export functions for certain attributes

(cherry picked from commit 5d963c0c996d50fa1033e7c2da48b5d1c3747f20)

Conflicts:
sw/source/filter/html/css1atr.cxx

Change-Id: I7f31cfab8c654d5c549db1343d1e222f50a42c60

2 files changed, 118 insertions, 110 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 995f2eadc603..d15b353158de 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -703,6 +703,13 @@ private:
     bool ReplaceRangeImpl(SwPaM&, OUString const&, const bool);
 
 public:
+    enum DocumentType {
+        DOCTYPE_NATIVE,
+        DOCTYPE_MSWORD              //This doc medul is come from Ms Word
+        };
+    DocumentType    meDocType;
+    DocumentType    GetDocumentType(){ return meDocType; }
+    void            SetDocumentType( DocumentType eDocType ) { meDocType = eDocType; }
 
     /** Life cycle
     */
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index cf911ab8bb0c..e49255e98af4 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -96,7 +96,8 @@ RES_CHRATR_BEGIN = HINT_BEGIN,
     RES_CHRATR_SHADOW,                      // 41
     RES_CHRATR_HIGHLIGHT,                   // 42
     RES_CHRATR_GRABBAG,                     // 43
-    RES_CHRATR_DUMMY3,                      // 44
+    RES_CHRATR_BIDIRTL,                     // 44
+    RES_CHRATR_IDCTHINT,                    // 45
 RES_CHRATR_END
 };
 
@@ -122,27 +123,27 @@ RES_TXTATR_BEGIN = RES_CHRATR_END,
    - META and METAFIELD must precede CJK_RUBY and INETFMT
  */
 RES_TXTATR_WITHEND_BEGIN = RES_TXTATR_BEGIN ,
-    RES_TXTATR_REFMARK = RES_TXTATR_WITHEND_BEGIN,  // 45
-    RES_TXTATR_TOXMARK,                             // 46
-    RES_TXTATR_META,                                // 47
-    RES_TXTATR_METAFIELD,                           // 48
-    RES_TXTATR_AUTOFMT,                             // 49
-    RES_TXTATR_INETFMT,                             // 50
-    RES_TXTATR_CHARFMT,                             // 51
-    RES_TXTATR_CJK_RUBY,                            // 52
-    RES_TXTATR_UNKNOWN_CONTAINER,                   // 53
-    RES_TXTATR_INPUTFIELD,                          // 54
+    RES_TXTATR_REFMARK = RES_TXTATR_WITHEND_BEGIN,  // 46
+    RES_TXTATR_TOXMARK,                             // 47
+    RES_TXTATR_META,                                // 48
+    RES_TXTATR_METAFIELD,                           // 49
+    RES_TXTATR_AUTOFMT,                             // 50
+    RES_TXTATR_INETFMT,                             // 51
+    RES_TXTATR_CHARFMT,                             // 52
+    RES_TXTATR_CJK_RUBY,                            // 53
+    RES_TXTATR_UNKNOWN_CONTAINER,                   // 54
+    RES_TXTATR_INPUTFIELD,                          // 55
 RES_TXTATR_WITHEND_END,
 
 // all TextAttributes without an end
 RES_TXTATR_NOEND_BEGIN = RES_TXTATR_WITHEND_END,
-    RES_TXTATR_FIELD = RES_TXTATR_NOEND_BEGIN,      // 55
-    RES_TXTATR_FLYCNT,                              // 56
-    RES_TXTATR_FTN,                                 // 57
-    RES_TXTATR_ANNOTATION,                          // 58
-    RES_TXTATR_DUMMY3,                              // 59
-    RES_TXTATR_DUMMY1,                              // 60
-    RES_TXTATR_DUMMY2,                              // 61
+    RES_TXTATR_FIELD = RES_TXTATR_NOEND_BEGIN,      // 56
+    RES_TXTATR_FLYCNT,                              // 57
+    RES_TXTATR_FTN,                                 // 58
+    RES_TXTATR_ANNOTATION,                          // 59
+    RES_TXTATR_DUMMY3,                              // 60
+    RES_TXTATR_DUMMY1,                              // 61
+    RES_TXTATR_DUMMY2,                              // 62
 RES_TXTATR_NOEND_END,
 RES_TXTATR_END = RES_TXTATR_NOEND_END
 };
@@ -150,25 +151,25 @@ RES_TXTATR_END = RES_TXTATR_NOEND_END
 enum RES_PARATR
 {
 RES_PARATR_BEGIN = RES_TXTATR_END,
-    RES_PARATR_LINESPACING = RES_PARATR_BEGIN,      // 62
-    RES_PARATR_ADJUST,                              // 63
-    RES_PARATR_SPLIT,                               // 64
-    RES_PARATR_ORPHANS,                             // 65
-    RES_PARATR_WIDOWS,                              // 66
-    RES_PARATR_TABSTOP,                             // 67
-    RES_PARATR_HYPHENZONE,                          // 68
-    RES_PARATR_DROP,                                // 69
-    RES_PARATR_REGISTER,                            // 70
-    RES_PARATR_NUMRULE,                             // 71
-    RES_PARATR_SCRIPTSPACE,                         // 72
-    RES_PARATR_HANGINGPUNCTUATION,                  // 73
-    RES_PARATR_FORBIDDEN_RULES,                     // 74
-    RES_PARATR_VERTALIGN,                           // 75
-    RES_PARATR_SNAPTOGRID,                          // 76
-    RES_PARATR_CONNECT_BORDER,                      // 77
-    RES_PARATR_OUTLINELEVEL,                        // 78
-    RES_PARATR_RSID,                                // 79
-    RES_PARATR_GRABBAG,                             // 80
+    RES_PARATR_LINESPACING = RES_PARATR_BEGIN,      // 63
+    RES_PARATR_ADJUST,                              // 64
+    RES_PARATR_SPLIT,                               // 65
+    RES_PARATR_ORPHANS,                             // 66
+    RES_PARATR_WIDOWS,                              // 67
+    RES_PARATR_TABSTOP,                             // 68
+    RES_PARATR_HYPHENZONE,                          // 69
+    RES_PARATR_DROP,                                // 70
+    RES_PARATR_REGISTER,                            // 71
+    RES_PARATR_NUMRULE,                             // 72
+    RES_PARATR_SCRIPTSPACE,                         // 73
+    RES_PARATR_HANGINGPUNCTUATION,                  // 74
+    RES_PARATR_FORBIDDEN_RULES,                     // 75
+    RES_PARATR_VERTALIGN,                           // 76
+    RES_PARATR_SNAPTOGRID,                          // 77
+    RES_PARATR_CONNECT_BORDER,                      // 78
+    RES_PARATR_OUTLINELEVEL,                        // 79
+    RES_PARATR_RSID,                                // 80
+    RES_PARATR_GRABBAG,                             // 81
 RES_PARATR_END
 };
 
@@ -177,103 +178,103 @@ RES_PARATR_END
 enum RES_PARATR_LIST
 {
 RES_PARATR_LIST_BEGIN = RES_PARATR_END,
-    RES_PARATR_LIST_ID = RES_PARATR_LIST_BEGIN,     // 81
-    RES_PARATR_LIST_LEVEL,                          // 82
-    RES_PARATR_LIST_ISRESTART,                      // 83
-    RES_PARATR_LIST_RESTARTVALUE,                   // 84
-    RES_PARATR_LIST_ISCOUNTED,                      // 85
+    RES_PARATR_LIST_ID = RES_PARATR_LIST_BEGIN,     // 82
+    RES_PARATR_LIST_LEVEL,                          // 83
+    RES_PARATR_LIST_ISRESTART,                      // 84
+    RES_PARATR_LIST_RESTARTVALUE,                   // 85
+    RES_PARATR_LIST_ISCOUNTED,                      // 86
 RES_PARATR_LIST_END
 };
 
 enum RES_FRMATR
 {
 RES_FRMATR_BEGIN = RES_PARATR_LIST_END,
-    RES_FILL_ORDER = RES_FRMATR_BEGIN,              // 86
-    RES_FRM_SIZE,                                   // 87
-    RES_PAPER_BIN,                                  // 88
-    RES_LR_SPACE,                                   // 89
-    RES_UL_SPACE,                                   // 90
-    RES_PAGEDESC,                                   // 91
-    RES_BREAK,                                      // 92
-    RES_CNTNT,                                      // 93
-    RES_HEADER,                                     // 94
-    RES_FOOTER,                                     // 95
-    RES_PRINT,                                      // 96
-    RES_OPAQUE,                                     // 97
-    RES_PROTECT,                                    // 98
-    RES_SURROUND,                                   // 99
-    RES_VERT_ORIENT,                                // 100
-    RES_HORI_ORIENT,                                // 101
-    RES_ANCHOR,                                     // 102
-    RES_BACKGROUND,                                 // 103
-    RES_BOX,                                        // 104
-    RES_SHADOW,                                     // 105
-    RES_FRMMACRO,                                   // 106
-    RES_COL,                                        // 107
-    RES_KEEP,                                       // 108
-    RES_URL,                                        // 109
-    RES_EDIT_IN_READONLY,                           // 110
-    RES_LAYOUT_SPLIT,                               // 111
-    RES_CHAIN,                                      // 112
-    RES_TEXTGRID,                                   // 113
-    RES_LINENUMBER  ,                               // 114
-    RES_FTN_AT_TXTEND,                              // 115
-    RES_END_AT_TXTEND,                              // 116
-    RES_COLUMNBALANCE,                              // 117
-    RES_FRAMEDIR,                                   // 118
-    RES_HEADER_FOOTER_EAT_SPACING,                  // 119
-    RES_ROW_SPLIT,                                  // 120
-    RES_FOLLOW_TEXT_FLOW,                           // 121
-    RES_COLLAPSING_BORDERS,                         // 122
-    RES_WRAP_INFLUENCE_ON_OBJPOS,                   // 123
-    RES_AUTO_STYLE,                                 // 124
-    RES_FRMATR_STYLE_NAME,                          // 125
-    RES_FRMATR_CONDITIONAL_STYLE_NAME,              // 126
-    RES_FILL_STYLE,                                 // 127
-    RES_FILL_GRADIENT,                              // 128
-    RES_FRMATR_GRABBAG,                             // 129
-    RES_TEXT_VERT_ADJUST,                           // 130
+    RES_FILL_ORDER = RES_FRMATR_BEGIN,              // 87
+    RES_FRM_SIZE,                                   // 88
+    RES_PAPER_BIN,                                  // 89
+    RES_LR_SPACE,                                   // 90
+    RES_UL_SPACE,                                   // 91
+    RES_PAGEDESC,                                   // 92
+    RES_BREAK,                                      // 93
+    RES_CNTNT,                                      // 94
+    RES_HEADER,                                     // 95
+    RES_FOOTER,                                     // 96
+    RES_PRINT,                                      // 97
+    RES_OPAQUE,                                     // 98
+    RES_PROTECT,                                    // 99
+    RES_SURROUND,                                   // 100
+    RES_VERT_ORIENT,                                // 101
+    RES_HORI_ORIENT,                                // 102
+    RES_ANCHOR,                                     // 103
+    RES_BACKGROUND,                                 // 104
+    RES_BOX,                                        // 105
+    RES_SHADOW,                                     // 106
+    RES_FRMMACRO,                                   // 107
+    RES_COL,                                        // 108
+    RES_KEEP,                                       // 109
+    RES_URL,                                        // 110
+    RES_EDIT_IN_READONLY,                           // 111
+    RES_LAYOUT_SPLIT,                               // 112
+    RES_CHAIN,                                      // 113
+    RES_TEXTGRID,                                   // 114
+    RES_LINENUMBER  ,                               // 115
+    RES_FTN_AT_TXTEND,                              // 116
+    RES_END_AT_TXTEND,                              // 117
+    RES_COLUMNBALANCE,                              // 118
+    RES_FRAMEDIR,                                   // 119
+    RES_HEADER_FOOTER_EAT_SPACING,                  // 120
+    RES_ROW_SPLIT,                                  // 121
+    RES_FOLLOW_TEXT_FLOW,                           // 122
+    RES_COLLAPSING_BORDERS,                         // 123
+    RES_WRAP_INFLUENCE_ON_OBJPOS,                   // 124
+    RES_AUTO_STYLE,                                 // 125
+    RES_FRMATR_STYLE_NAME,                          // 126
+    RES_FRMATR_CONDITIONAL_STYLE_NAME,              // 127
+    RES_FILL_STYLE,                                 // 128
+    RES_FILL_GRADIENT,                              // 129
+    RES_FRMATR_GRABBAG,                             // 130
+    RES_TEXT_VERT_ADJUST,                           // 131
 RES_FRMATR_END
 };
 
 enum RES_GRFATR
 {
 RES_GRFATR_BEGIN = RES_FRMATR_END,
-    RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN,        // 131
-    RES_GRFATR_CROPGRF,                             // 132
-
-    RES_GRFATR_ROTATION,                            // 133
-    RES_GRFATR_LUMINANCE,                           // 134
-    RES_GRFATR_CONTRAST,                            // 135
-    RES_GRFATR_CHANNELR,                            // 136
-    RES_GRFATR_CHANNELG,                            // 137
-    RES_GRFATR_CHANNELB,                            // 138
-    RES_GRFATR_GAMMA,                               // 139
-    RES_GRFATR_INVERT,                              // 140
-    RES_GRFATR_TRANSPARENCY,                        // 141
-    RES_GRFATR_DRAWMODE,                            // 142
-
-    RES_GRFATR_DUMMY1,                              // 143
-    RES_GRFATR_DUMMY2,                              // 144
-    RES_GRFATR_DUMMY3,                              // 145
-    RES_GRFATR_DUMMY4,                              // 146
-    RES_GRFATR_DUMMY5,                              // 147
+    RES_GRFATR_MIRRORGRF = RES_GRFATR_BEGIN,        // 132
+    RES_GRFATR_CROPGRF,                             // 133
+
+    RES_GRFATR_ROTATION,                            // 134
+    RES_GRFATR_LUMINANCE,                           // 135
+    RES_GRFATR_CONTRAST,                            // 136
+    RES_GRFATR_CHANNELR,                            // 137
+    RES_GRFATR_CHANNELG,                            // 138
+    RES_GRFATR_CHANNELB,                            // 139
+    RES_GRFATR_GAMMA,                               // 140
+    RES_GRFATR_INVERT,                              // 141
+    RES_GRFATR_TRANSPARENCY,                        // 142
+    RES_GRFATR_DRAWMODE,                            // 143
+
+    RES_GRFATR_DUMMY1,                              // 144
+    RES_GRFATR_DUMMY2,                              // 145
+    RES_GRFATR_DUMMY3,                              // 146
+    RES_GRFATR_DUMMY4,                              // 147
+    RES_GRFATR_DUMMY5,                              // 148
 RES_GRFATR_END
 };
 
 enum RES_BOXATR
 {
 RES_BOXATR_BEGIN = RES_GRFATR_END,
-    RES_BOXATR_FORMAT = RES_BOXATR_BEGIN,           // 148
-    RES_BOXATR_FORMULA,                             // 149
-    RES_BOXATR_VALUE,                               // 150
+    RES_BOXATR_FORMAT = RES_BOXATR_BEGIN,           // 149
+    RES_BOXATR_FORMULA,                             // 150
+    RES_BOXATR_VALUE,                               // 151
 RES_BOXATR_END
 };
 
 enum RES_UNKNOWNATR
 {
 RES_UNKNOWNATR_BEGIN = RES_BOXATR_END,
-    RES_UNKNOWNATR_CONTAINER = RES_UNKNOWNATR_BEGIN,// 151
+    RES_UNKNOWNATR_CONTAINER = RES_UNKNOWNATR_BEGIN,// 152
 RES_UNKNOWNATR_END
 };