sw: remove WorkaroundForB6375613

... which is incidentally the last user of XDocumentInfo.

Change-Id: I47dc31c8739aa1d50c2a3b26ac51a239417fa5b0

8 files changed, 93 insertions, 241 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
 };
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 0adddef63923..f2ac06ee2fb5 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -102,18 +102,11 @@
 
 #include <cmdid.h>              // for the default printer in SetJob
 
-
-#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
-#include <com/sun/star/beans/XPropertyContainer.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-
 #include <pausethreadstarting.hxx>
 #include <numrule.hxx>
 #include <list.hxx>
 #include <listfunc.hxx>
 
-#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-
 #include <sfx2/Metadatable.hxx>
 #include <fmtmeta.hxx> // MetaFieldManager
 #include <boost/foreach.hpp>
@@ -304,8 +297,6 @@ SwDoc::SwDoc()
     mbXMLExport(false),
 #endif
 
-    mbApplyWorkaroundForB6375613(false),
-
     // COMPATIBILITY FLAGS START
 
     mbAddFlyOffsets(false),
@@ -1000,44 +991,6 @@ void SwDoc::UpdateLinks( bool bUI )
 
 }
 
-void SwDoc::SetApplyWorkaroundForB6375613( bool p_bApplyWorkaroundForB6375613 )
-{
-    if ( mbApplyWorkaroundForB6375613 != p_bApplyWorkaroundForB6375613 )
-    {
-        mbApplyWorkaroundForB6375613 = p_bApplyWorkaroundForB6375613;
-
-        uno::Reference< document::XDocumentInfoSupplier > xDoc(
-                                                GetDocShell()->GetBaseModel(),
-                                                uno::UNO_QUERY);
-        if ( xDoc.is() )
-        {
-            uno::Reference< beans::XPropertyContainer > xDocInfo(
-                                                        xDoc->getDocumentInfo(),
-                                                        uno::UNO_QUERY );
-            if ( xDocInfo.is() )
-            {
-                try
-                {
-                    if ( mbApplyWorkaroundForB6375613 )
-                    {
-                        xDocInfo->addProperty(
-                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkaroundForB6375613Applied")),
-                            beans::PropertyAttribute::TRANSIENT | beans::PropertyAttribute::REMOVABLE,
-                            uno::makeAny( false ) );
-                    }
-                    else
-                    {
-                        xDocInfo->removeProperty( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkaroundForB6375613Applied")) );
-                    }
-                }
-                catch( uno::Exception& )
-                {
-                }
-            }
-        }
-    }
-}
-
 ::sfx2::IXmlIdRegistry&
 SwDoc::GetXmlIdRegistry()
 {
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 8752828b7d70..69a76184dadb 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -61,8 +61,6 @@
 #include <pam.hxx>
 #include <docsh.hxx>
 #include <poolfmt.hxx>
-#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <set>
 
@@ -682,69 +680,6 @@ sal_Bool SwLayHelper::CheckInsertPage()
     return sal_False;
 }
 
-//
-static bool lcl_HasTextFrmAnchoredObjs( SwTxtFrm* p_pTxtFrm )
-{
-    bool bHasTextFrmAnchoredObjs( false );
-
-    const SwFrmFmts* pSpzFrmFmts = p_pTxtFrm->GetTxtNode()->GetDoc()->GetSpzFrmFmts();
-    for ( sal_uInt16 i = 0; i < pSpzFrmFmts->size(); ++i )
-    {
-        SwFrmFmt *pFmt = (SwFrmFmt*)(*pSpzFrmFmts)[i];
-        const SwFmtAnchor &rAnch = pFmt->GetAnchor();
-        if ( rAnch.GetCntntAnchor() &&
-             ((rAnch.GetAnchorId() == FLY_AT_PARA) ||
-              (rAnch.GetAnchorId() == FLY_AT_CHAR)) &&
-             rAnch.GetCntntAnchor()->nNode.GetIndex() ==
-                                        p_pTxtFrm->GetTxtNode()->GetIndex() )
-        {
-            bHasTextFrmAnchoredObjs = true;
-            break;
-        }
-    }
-
-    return bHasTextFrmAnchoredObjs;
-}
-
-static void lcl_ApplyWorkaroundForB6375613( SwFrm* p_pFirstFrmOnNewPage )
-{
-    SwTxtFrm* pFirstTextFrmOnNewPage = dynamic_cast<SwTxtFrm*>(p_pFirstFrmOnNewPage);
-    //
-    if ( pFirstTextFrmOnNewPage &&
-         !pFirstTextFrmOnNewPage->IsFollow() &&
-         pFirstTextFrmOnNewPage->GetTxt().Len() == 0 &&
-         lcl_HasTextFrmAnchoredObjs( pFirstTextFrmOnNewPage ) )
-    {
-        // apply page break before at this text frame to assure, that it doesn't flow backward.
-        const SvxBreak eBreak =
-                    pFirstTextFrmOnNewPage->GetAttrSet()->GetBreak().GetBreak();
-        if ( eBreak == SVX_BREAK_NONE )
-        {
-            pFirstTextFrmOnNewPage->GetTxtNode()->LockModify();
-            SwDoc* pDoc( pFirstTextFrmOnNewPage->GetTxtNode()->GetDoc() );
-            IDocumentContentOperations* pIDCO = pFirstTextFrmOnNewPage->GetTxtNode()->getIDocumentContentOperations();
-            const SwPaM aTmpPaM( *(pFirstTextFrmOnNewPage->GetTxtNode()) );
-            pIDCO->InsertPoolItem( aTmpPaM,
-                SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE, RES_BREAK ), 0 );
-            pFirstTextFrmOnNewPage->GetTxtNode()->UnlockModify();
-
-            uno::Reference< document::XDocumentInfoSupplier > xDoc(
-                                        pDoc->GetDocShell()->GetBaseModel(),
-                                        uno::UNO_QUERY);
-            uno::Reference< beans::XPropertySet > xDocInfo(
-                                        xDoc->getDocumentInfo(),
-                                        uno::UNO_QUERY );
-            try
-            {
-                xDocInfo->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkaroundForB6375613Applied")), uno::makeAny( true ) );
-            }
-            catch( uno::Exception& )
-            {
-            }
-        }
-    }
-}
-
 /*
  * SwLayHelper::CheckInsert
  *  is the entry point for the _InsertCnt-function.
@@ -937,11 +872,6 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
             SwPageFrm* pLastPage = rpPage;
             if( CheckInsertPage() )
             {
-                //
-                if ( pDoc->ApplyWorkaroundForB6375613() )
-                {
-                    lcl_ApplyWorkaroundForB6375613( rpFrm );
-                }
                 _CheckFlyCache( pLastPage );
                 if( rpPrv && rpPrv->IsTxtFrm() && !rpPrv->GetValidSizeFlag() )
                     rpPrv->Frm().Height( rpPrv->GetUpper()->Prt().Height() );
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index d99789532884..8849dfd379ef 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1549,7 +1549,6 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     { SW_PROP_NMID(UNO_NAME_LOCK_UPDATES),        WID_DOC_LOCK_UPDATES,     CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,   0},
                     { SW_PROP_NMID(UNO_NAME_HAS_VALID_SIGNATURES),  WID_DOC_HAS_VALID_SIGNATURES, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::READONLY,   0},
                     { SW_PROP_NMID(UNO_NAME_BUILDID), WID_DOC_BUILDID, CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0},
-                    { SW_PROP_NMID(UNO_NAME_APPLY_WORKAROUND_FOR_B6375613), WID_APPLY_WORKAROUND_FOR_B6375613, CPPU_E2T(CPPUTYPE_BOOLEAN), 0, 0},
                     {0,0,0,0,0,0}
                 };
                 aMapEntriesArr[nPropertyId] = aDocMap_Impl;
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index b4ea5b9f9794..d2d653fe0e11 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -737,55 +737,54 @@ const SwPropNameTab aPropNameTab = {
 /* 0707 UNO_NAME_HAS_VALID_SIGNATURES*/ {MAP_CHAR_LEN("HasValidSignatures")},
 /* 0708 UNO_CHAR_AUTO_STYLE_NAME */     {MAP_CHAR_LEN("CharAutoStyleName")},
 /* 0709 UNO_PARA_AUTO_STYLE_NAME */     {MAP_CHAR_LEN("ParaAutoStyleName")},
-/* 0710 UNO_NAME_APPLY_WORKAROUND_FOR_B6375613*/ {MAP_CHAR_LEN("ApplyWorkaroundForB6375613")},
-/* 0711 UNO_NAME_LAYOUT_SIZE*/ {MAP_CHAR_LEN("LayoutSize")},
-/* 0712 UNO_NAME_HELP */ {MAP_CHAR_LEN("Help")},
-/* 0713 UNO_NAME_TOOLTIP */ {MAP_CHAR_LEN("Tooltip")},
-/* 0714 UNO_NAME_DIALOG_LIBRARIES*/     {MAP_CHAR_LEN("DialogLibraries")},
-/* 0715 UNO_NAME_HEADER_ROW_COUNT*/     {MAP_CHAR_LEN("HeaderRowCount")},
-/* 0716 UNO_NAME_INPUT */                {MAP_CHAR_LEN("Input")},
-/* 0717 UNO_NAME_ROW_SPAN */            {MAP_CHAR_LEN("RowSpan")},
-/* 0718 UNO_NAME_POSITION_AND_SPACE_MODE */ {MAP_CHAR_LEN("PositionAndSpaceMode")},
-/* 0719 UNO_NAME_LABEL_FOLLOWED_BY */       {MAP_CHAR_LEN("LabelFollowedBy")},
-/* 0720 UNO_NAME_LISTTAB_STOP_POSITION */   {MAP_CHAR_LEN("ListtabStopPosition")},
-/* 0721 UNO_NAME_FIRST_LINE_INDENT */       {MAP_CHAR_LEN("FirstLineIndent")},
-/* 0722 UNO_NAME_INDENT_AT */               {MAP_CHAR_LEN("IndentAt")},
-/* 0723 UNO_NAME_CHAPTER_LEVEL */       {MAP_CHAR_LEN("ChapterLevel")},
-/* 0724 UNO_NAME_GRID_BASE_WIDTH*/ {MAP_CHAR_LEN("GridBaseWidth")},
-/* 0725 UNO_NAME_GRID_SNAP_TO_CHARS*/ {MAP_CHAR_LEN("GridSnapToChars")},
-/* 0726 UNO_NAME_GRID_STANDARD_PAGE_MODE*/ {MAP_CHAR_LEN("StandardPageMode")},
-/* 0727 UNO_NAME_TABLE_BORDER_DISTANCES */ {MAP_CHAR_LEN("TableBorderDistances")},
-/* 0728 UNO_NAME_LIST_ID*/ {MAP_CHAR_LEN("ListId")},
-/* 0729 UNO_NAME_DEFAULT_LIST_ID*/ {MAP_CHAR_LEN("DefaultListId")},
-/* 0730 UNO_NAME_STREAM_NAME */ {MAP_CHAR_LEN("StreamName")},
-/* 0731 UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE */  {MAP_CHAR_LEN("ContinueingPreviousSubTree")},
-/* 0732 UNO_NAME_PARA_LIST_LABEL_STRING */  {MAP_CHAR_LEN("ListLabelString")},
-/* 0733 CHAR_OVERLINE */               {MAP_CHAR_LEN("CharOverline")},
-/* 0734 CHAR_OVERLINE_COLOR */         {MAP_CHAR_LEN("CharOverlineColor")},
-/* 0735 CHAR_OVERLINE_HAS_COLOR */     {MAP_CHAR_LEN("CharOverlineHasColor")},
-/* 0736 UNO_NAME_OUTLINE_LEVEL */       {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
-/* 0737 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")},
-/* 0738 UNO_NAME_META */        {MAP_CHAR_LEN("InContentMetadata")},
-/* 0739 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")},
-/* 0740 UNO_NAME_VBA_DOCOBJ */       {MAP_CHAR_LEN("ThisVBADocObj")},
-/* 0741 UNO_NAME_NESTED_TEXT_CONTENT */ {MAP_CHAR_LEN("NestedTextContent")},
-/* 0742 UNO_NAME_SEPARATOR_LINE_STYLE */ {MAP_CHAR_LEN("SeparatorLineStyle")},
-/* 0743 UNO_NAME_FOOTNOTE_LINE_STYLE */ {MAP_CHAR_LEN("FootnoteLineStyle")},
-/* 0744 UNO_NAME_EMBEDDED_OBJECT */ {MAP_CHAR_LEN("EmbeddedObject")},
-/* 0745 UNO_NAME_RSID */             {MAP_CHAR_LEN("Rsid")},
-/* 0746 UNO_NAME_PARRSID */          {MAP_CHAR_LEN("ParRsid")},
+/* 0710 UNO_NAME_LAYOUT_SIZE*/ {MAP_CHAR_LEN("LayoutSize")},
+/* 0711 UNO_NAME_HELP */ {MAP_CHAR_LEN("Help")},
+/* 0712 UNO_NAME_TOOLTIP */ {MAP_CHAR_LEN("Tooltip")},
+/* 0713 UNO_NAME_DIALOG_LIBRARIES*/     {MAP_CHAR_LEN("DialogLibraries")},
+/* 0714 UNO_NAME_HEADER_ROW_COUNT*/     {MAP_CHAR_LEN("HeaderRowCount")},
+/* 0715 UNO_NAME_INPUT */                {MAP_CHAR_LEN("Input")},
+/* 0716 UNO_NAME_ROW_SPAN */            {MAP_CHAR_LEN("RowSpan")},
+/* 0717 UNO_NAME_POSITION_AND_SPACE_MODE */ {MAP_CHAR_LEN("PositionAndSpaceMode")},
+/* 0718 UNO_NAME_LABEL_FOLLOWED_BY */       {MAP_CHAR_LEN("LabelFollowedBy")},
+/* 0719 UNO_NAME_LISTTAB_STOP_POSITION */   {MAP_CHAR_LEN("ListtabStopPosition")},
+/* 0720 UNO_NAME_FIRST_LINE_INDENT */       {MAP_CHAR_LEN("FirstLineIndent")},
+/* 0721 UNO_NAME_INDENT_AT */               {MAP_CHAR_LEN("IndentAt")},
+/* 0722 UNO_NAME_CHAPTER_LEVEL */       {MAP_CHAR_LEN("ChapterLevel")},
+/* 0723 UNO_NAME_GRID_BASE_WIDTH*/ {MAP_CHAR_LEN("GridBaseWidth")},
+/* 0724 UNO_NAME_GRID_SNAP_TO_CHARS*/ {MAP_CHAR_LEN("GridSnapToChars")},
+/* 0725 UNO_NAME_GRID_STANDARD_PAGE_MODE*/ {MAP_CHAR_LEN("StandardPageMode")},
+/* 0726 UNO_NAME_TABLE_BORDER_DISTANCES */ {MAP_CHAR_LEN("TableBorderDistances")},
+/* 0727 UNO_NAME_LIST_ID*/ {MAP_CHAR_LEN("ListId")},
+/* 0728 UNO_NAME_DEFAULT_LIST_ID*/ {MAP_CHAR_LEN("DefaultListId")},
+/* 0729 UNO_NAME_STREAM_NAME */ {MAP_CHAR_LEN("StreamName")},
+/* 0730 UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE */  {MAP_CHAR_LEN("ContinueingPreviousSubTree")},
+/* 0731 UNO_NAME_PARA_LIST_LABEL_STRING */  {MAP_CHAR_LEN("ListLabelString")},
+/* 0732 CHAR_OVERLINE */               {MAP_CHAR_LEN("CharOverline")},
+/* 0733 CHAR_OVERLINE_COLOR */         {MAP_CHAR_LEN("CharOverlineColor")},
+/* 0734 CHAR_OVERLINE_HAS_COLOR */     {MAP_CHAR_LEN("CharOverlineHasColor")},
+/* 0735 UNO_NAME_OUTLINE_LEVEL */       {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel
+/* 0736 UNO_NAME_DESCRIPTION */         {MAP_CHAR_LEN("Description")},
+/* 0737 UNO_NAME_META */        {MAP_CHAR_LEN("InContentMetadata")},
+/* 0738 UNO_NAME_IS_TEMPLATE */       {MAP_CHAR_LEN("IsTemplate")},
+/* 0739 UNO_NAME_VBA_DOCOBJ */       {MAP_CHAR_LEN("ThisVBADocObj")},
+/* 0740 UNO_NAME_NESTED_TEXT_CONTENT */ {MAP_CHAR_LEN("NestedTextContent")},
+/* 0741 UNO_NAME_SEPARATOR_LINE_STYLE */ {MAP_CHAR_LEN("SeparatorLineStyle")},
+/* 0742 UNO_NAME_FOOTNOTE_LINE_STYLE */ {MAP_CHAR_LEN("FootnoteLineStyle")},
+/* 0743 UNO_NAME_EMBEDDED_OBJECT */ {MAP_CHAR_LEN("EmbeddedObject")},
+/* 0744 UNO_NAME_RSID */             {MAP_CHAR_LEN("Rsid")},
+/* 0745 UNO_NAME_PARRSID */          {MAP_CHAR_LEN("ParRsid")},
 
-/* 0747 UNO_NAME_LINE_STYLE */           {MAP_CHAR_LEN("LineStyle")},
-/* 0748 UNO_NAME_LINE_WIDTH */           {MAP_CHAR_LEN("LineWidth")},
+/* 0746 UNO_NAME_LINE_STYLE */           {MAP_CHAR_LEN("LineStyle")},
+/* 0747 UNO_NAME_LINE_WIDTH */           {MAP_CHAR_LEN("LineWidth")},
 
-/* 0749 PARA_CONTEXT_MARGIN */           {MAP_CHAR_LEN("ParaContextMargin")},
-/* 0750 PARAGRAPH_STYLE_NAME */           {MAP_CHAR_LEN("ParagraphStyleName")},
-/* 0751 FIRST_IS_SHARED */             {MAP_CHAR_LEN("FirstIsShared")},
-/* 0752 HEADER_TEXT_FIRST */            {MAP_CHAR_LEN("HeaderTextFirst")},
-/* 0753 FOOTER_TEXT_FIRST */            {MAP_CHAR_LEN("FooterTextFirst")},
-/* 0754 UNO_NAME_INITIALS */            {MAP_CHAR_LEN("Initials")},
-/* 0755 UNO_NAME_INITIALS */            {MAP_CHAR_LEN("TableBorder2")},
-/* 0756 UNO_NAME_REPLACEMENT_GRAPHIC_URL */ {MAP_CHAR_LEN("ReplacementGraphicURL")},
+/* 0748 PARA_CONTEXT_MARGIN */           {MAP_CHAR_LEN("ParaContextMargin")},
+/* 0749 PARAGRAPH_STYLE_NAME */           {MAP_CHAR_LEN("ParagraphStyleName")},
+/* 0750 FIRST_IS_SHARED */             {MAP_CHAR_LEN("FirstIsShared")},
+/* 0751 HEADER_TEXT_FIRST */            {MAP_CHAR_LEN("HeaderTextFirst")},
+/* 0752 FOOTER_TEXT_FIRST */            {MAP_CHAR_LEN("FooterTextFirst")},
+/* 0753 UNO_NAME_INITIALS */            {MAP_CHAR_LEN("Initials")},
+/* 0754 UNO_NAME_INITIALS */            {MAP_CHAR_LEN("TableBorder2")},
+/* 0755 UNO_NAME_REPLACEMENT_GRAPHIC_URL */ {MAP_CHAR_LEN("ReplacementGraphicURL")},
 
 // new items in this array must match enum SwPropNameIds
 };
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index da4f1902fc69..acc770669257 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -1982,14 +1982,6 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
         case WID_DOC_BUILDID:
             aValue >>= maBuildId;
         break;
-        //
-        case WID_APPLY_WORKAROUND_FOR_B6375613:
-        {
-            bool bApplyWorkaroundForB6375613( false );
-            aValue >>= bApplyWorkaroundForB6375613;
-            pDocShell->GetDoc()->SetApplyWorkaroundForB6375613( bApplyWorkaroundForB6375613 );
-        }
-        break;
 
         default:
         {
@@ -2144,12 +2136,6 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
         case WID_DOC_HAS_VALID_SIGNATURES:
             aAny <<= hasValidSignatures();
         break;
-        //
-        case WID_APPLY_WORKAROUND_FOR_B6375613:
-        {
-            aAny <<= pDocShell->GetDoc()->ApplyWorkaroundForB6375613();
-        }
-        break;
 
         default:
         {