fdo#69613: Code changes for TOC with flag '\z' should get preserved after RT.

Issue :
	TOC field flag '\z' was not getting preserved after RT.

Implementation :
	Provided import & export support for TOC field flag '\z'.

XML file difference :
        In document.xml,
        Before - <w:instrText>
		     TOC
		 </w:instrText>
	After -  <w:instrText>
                     TOC \z \o "1-3" \o "1-3" \h
                 </w:instrText>

Conflicts:
	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
	writerfilter/source/dmapper/PropertyIds.cxx
	writerfilter/source/dmapper/PropertyIds.hxx
Reviewed on:
	https://gerrit.libreoffice.org/7217

Change-Id: I84f90a722c7afbdf626db2cc60c4e73580891d36

3 files changed, 11 insertions, 3 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3ece3551e25d..a5047a969ed8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2695,10 +2695,13 @@ void DomainMapper_Impl::handleToc
     bool bHyperlinks = false;
     bool bFromOutline = false;
     bool bFromEntries = false;
+    bool bHideTabLeaderPageNumbers = false ;
+
     sal_Int16 nMaxLevel = 10;
     OUString sTemplate;
     OUString sChapterNoSeparator;
     OUString sFigureSequence;
+    uno::Reference< beans::XPropertySet > xTOC;
 
 //                  \a Builds a table of figures but does not include the captions's label and number
     if( lcl_FindInCommand( pContext->GetCommand(), 'a', sValue ))
@@ -2788,14 +2791,16 @@ void DomainMapper_Impl::handleToc
                         //todo: unsupported
 //                    }
 //                  \z Hides page numbers within the table of contens when shown in Web Layout View
-//                    if( lcl_FindInCommand( pContext->GetCommand(), 'z', sValue ))
-//                    { //todo: unsupported feature  }
+                    if( lcl_FindInCommand( pContext->GetCommand(), 'z', sValue ))
+                    {
+                        bHideTabLeaderPageNumbers = true ;
+                    }
 
                     //if there's no option then it should be created from outline
     if( !bFromOutline && !bFromEntries && sTemplate.isEmpty()  )
         bFromOutline = true;
 
-    uno::Reference< beans::XPropertySet > xTOC;
+
     if (m_xTextFactory.is())
         xTOC.set(
                 m_xTextFactory->createInstance
@@ -2810,6 +2815,7 @@ void DomainMapper_Impl::handleToc
         xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_LEVEL ), uno::makeAny( nMaxLevel ) );
         xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_CREATE_FROM_OUTLINE ), uno::makeAny( bFromOutline ));
         xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_CREATE_FROM_MARKS ), uno::makeAny( bFromEntries ));
+        xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS ), uno::makeAny( bHideTabLeaderPageNumbers ));
         if( !sTemplate.isEmpty() )
         {
                             //the string contains comma separated the names and related levels
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index 1cce816a282d..dfe4369c18cf 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -360,6 +360,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const
             case PROP_CHAR_THEME_COLOR_SHADE        :   sName = "CharThemeColorShade"; break;
             case PROP_CHAR_THEME_FILL               :   sName = "CharThemeFill"; break;
             case PROP_HORIZONTAL_MERGE: sName = "HorizontalMerge"; break;
+            case PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS      :    sName = "HideTabLeaderAndPageNumber" ; break ;
         }
         ::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt =
                 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index 2a9c1ee6d2f1..4f73caac3272 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -331,6 +331,7 @@ enum PropertyIds
         ,PROP_CHAR_THEME_COLOR_SHADE
         ,PROP_CHAR_THEME_FILL
         ,PROP_HORIZONTAL_MERGE
+        ,PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS
     };
 struct PropertyNameSupplier_Impl;
 class PropertyNameSupplier