diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-11-21 22:46:01 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-11-22 12:10:31 +0100 |
commit | 9c5d6ea5efb5f56a4ac96b4a8505ed84abbbc6bf (patch) | |
tree | 6ea7b2b4ddb2fd2126b56074b85f39593de4beba /sw/inc | |
parent | 117fdb9898dcc379b4f83437e858c57fd1d11911 (diff) |
sw: remove WorkaroundForB6375613
... which is incidentally the last user of XDocumentInfo.
Change-Id: I47dc31c8739aa1d50c2a3b26ac51a239417fa5b0
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/doc.hxx | 13 | ||||
-rw-r--r-- | sw/inc/unomap.hxx | 1 | ||||
-rw-r--r-- | sw/inc/unoprnms.hxx | 95 |
3 files changed, 47 insertions, 62 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 01276165ac52..ae910d89c648 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -481,13 +481,6 @@ private: bool mbXMLExport : 1; ///< sal_True: during XML export #endif - // Document flag to trigger conversion, which applys the workaround for documents, - // which uses a certain layout defect in OOo 1.x to layout the documents. - // This conversion is performed, when the frames for the layout are created. - // Thus, this document flag has to be set after load a document and before - // creating the document view. - bool mbApplyWorkaroundForB6375613 : 1; - // // COMPATIBILITY FLAGS START // @@ -2036,12 +2029,6 @@ public: void initXForms( bool bCreateDefaultModel ); // access methods for XForms model(s) - inline bool ApplyWorkaroundForB6375613() const - { - return mbApplyWorkaroundForB6375613; - } - void SetApplyWorkaroundForB6375613( bool p_bApplyWorkaroundForB6375613 ); - //Update all the page masters void SetDefaultPageMode(bool bSquaredPageMode); sal_Bool IsSquaredPageMode() const; diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index cd583e22b84a..7f130a210a8a 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -238,7 +238,6 @@ #define WID_DOC_HAS_VALID_SIGNATURES 1017 #define WID_DOC_BUILDID 1024 #define WID_DOC_ISTEMPLATEID 1025 -#define WID_APPLY_WORKAROUND_FOR_B6375613 1070 // MailMerge #define WID_SELECTION 1071 diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 2f3c2d33801b..28c7ba4eeae5 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -753,71 +753,70 @@ enum SwPropNameIds /* 0708 */ UNO_NAME_CHAR_AUTO_STYLE_NAME, /* 0709 */ UNO_NAME_PARA_AUTO_STYLE_NAME, -/* 0710 */ UNO_NAME_APPLY_WORKAROUND_FOR_B6375613, -/* 0711 */ UNO_NAME_LAYOUT_SIZE, +/* 0710 */ UNO_NAME_LAYOUT_SIZE, -/* 0712 */ UNO_NAME_HELP, -/* 0713 */ UNO_NAME_TOOLTIP, +/* 0711 */ UNO_NAME_HELP, +/* 0712 */ UNO_NAME_TOOLTIP, -/* 0714 */ UNO_NAME_DIALOG_LIBRARIES, -/* 0715 */ UNO_NAME_HEADER_ROW_COUNT, -/* 0716 */ UNO_NAME_INPUT, -/* 0717 */ UNO_NAME_ROW_SPAN, +/* 0713 */ UNO_NAME_DIALOG_LIBRARIES, +/* 0714 */ UNO_NAME_HEADER_ROW_COUNT, +/* 0715 */ UNO_NAME_INPUT, +/* 0716 */ UNO_NAME_ROW_SPAN, -/* 0718 */ UNO_NAME_POSITION_AND_SPACE_MODE, -/* 0719 */ UNO_NAME_LABEL_FOLLOWED_BY, -/* 0720 */ UNO_NAME_LISTTAB_STOP_POSITION, -/* 0721 */ UNO_NAME_FIRST_LINE_INDENT, -/* 0722 */ UNO_NAME_INDENT_AT, +/* 0717 */ UNO_NAME_POSITION_AND_SPACE_MODE, +/* 0718 */ UNO_NAME_LABEL_FOLLOWED_BY, +/* 0719 */ UNO_NAME_LISTTAB_STOP_POSITION, +/* 0720 */ UNO_NAME_FIRST_LINE_INDENT, +/* 0721 */ UNO_NAME_INDENT_AT, -/* 0723 */ UNO_NAME_CHAPTER_LEVEL, +/* 0722 */ UNO_NAME_CHAPTER_LEVEL, -/* 0724 */ UNO_NAME_GRID_BASE_WIDTH, -/* 0725 */ UNO_NAME_GRID_SNAP_TO_CHARS, -/* 0726 */ UNO_NAME_GRID_STANDARD_PAGE_MODE, -/* 0727 */ UNO_NAME_TABLE_BORDER_DISTANCES, +/* 0723 */ UNO_NAME_GRID_BASE_WIDTH, +/* 0724 */ UNO_NAME_GRID_SNAP_TO_CHARS, +/* 0725 */ UNO_NAME_GRID_STANDARD_PAGE_MODE, +/* 0726 */ UNO_NAME_TABLE_BORDER_DISTANCES, -/* 0728 */ UNO_NAME_LIST_ID, -/* 0729 */ UNO_NAME_DEFAULT_LIST_ID, +/* 0727 */ UNO_NAME_LIST_ID, +/* 0728 */ UNO_NAME_DEFAULT_LIST_ID, -/* 0730 */ UNO_NAME_STREAM_NAME, +/* 0729 */ UNO_NAME_STREAM_NAME, -/* 0731 */ UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE, -/* 0732 */ UNO_NAME_PARA_LIST_LABEL_STRING, +/* 0730 */ UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE, +/* 0731 */ UNO_NAME_PARA_LIST_LABEL_STRING, -/* 0733 */ UNO_NAME_CHAR_OVERLINE, -/* 0734 */ UNO_NAME_CHAR_OVERLINE_COLOR, -/* 0735 */ UNO_NAME_CHAR_OVERLINE_HAS_COLOR, -/* 0736 */ UNO_NAME_OUTLINE_LEVEL, +/* 0732 */ UNO_NAME_CHAR_OVERLINE, +/* 0733 */ UNO_NAME_CHAR_OVERLINE_COLOR, +/* 0734 */ UNO_NAME_CHAR_OVERLINE_HAS_COLOR, +/* 0735 */ UNO_NAME_OUTLINE_LEVEL, -/* 0737 */ UNO_NAME_DESCRIPTION, -/* 0738 */ UNO_NAME_META, -/* 0739 */ UNO_NAME_IS_TEMPLATE, -/* 0740 */ UNO_NAME_VBA_DOCOBJ, -/* 0741 */ UNO_NAME_NESTED_TEXT_CONTENT, -/* 0742 */ UNO_NAME_SEPARATOR_LINE_STYLE, -/* 0743 */ UNO_NAME_FOOTNOTE_LINE_STYLE, -/* 0744 */ UNO_NAME_EMBEDDED_OBJECT, -/* 0745 */ UNO_NAME_RSID, -/* 0746 */ UNO_NAME_PARRSID, +/* 0736 */ UNO_NAME_DESCRIPTION, +/* 0737 */ UNO_NAME_META, +/* 0738 */ UNO_NAME_IS_TEMPLATE, +/* 0739 */ UNO_NAME_VBA_DOCOBJ, +/* 0740 */ UNO_NAME_NESTED_TEXT_CONTENT, +/* 0741 */ UNO_NAME_SEPARATOR_LINE_STYLE, +/* 0742 */ UNO_NAME_FOOTNOTE_LINE_STYLE, +/* 0743 */ UNO_NAME_EMBEDDED_OBJECT, +/* 0744 */ UNO_NAME_RSID, +/* 0745 */ UNO_NAME_PARRSID, -/* 0747 */ UNO_NAME_LINE_STYLE, -/* 0748 */ UNO_NAME_LINE_WIDTH, +/* 0746 */ UNO_NAME_LINE_STYLE, +/* 0747 */ UNO_NAME_LINE_WIDTH, -/* 0749 */ UNO_NAME_PARA_CONTEXT_MARGIN, +/* 0748 */ UNO_NAME_PARA_CONTEXT_MARGIN, -/* 0750 */ UNO_NAME_PARAGRAPH_STYLE_NAME, +/* 0749 */ UNO_NAME_PARAGRAPH_STYLE_NAME, -/* 0751 */ UNO_NAME_FIRST_IS_SHARED, -/* 0752 */ UNO_NAME_HEADER_TEXT_FIRST, -/* 0753 */ UNO_NAME_FOOTER_TEXT_FIRST, +/* 0750 */ UNO_NAME_FIRST_IS_SHARED, +/* 0751 */ UNO_NAME_HEADER_TEXT_FIRST, +/* 0752 */ UNO_NAME_FOOTER_TEXT_FIRST, -/* 0754 */ UNO_NAME_INITIALS, -/* 0755 */ UNO_NAME_TABLE_BORDER2, +/* 0753 */ UNO_NAME_INITIALS, +/* 0754 */ UNO_NAME_TABLE_BORDER2, -/* 0756 */ UNO_NAME_REPLACEMENT_GRAPHIC_URL, +/* 0755 */ UNO_NAME_REPLACEMENT_GRAPHIC_URL, -/* 0757 */ SW_PROPNAME_END +/* 0756 */ SW_PROPNAME_END // new items in this array must match SwPropNameTab aPropNameTab }; |