diff options
| author | YogeshBharate <yogesh.bharate@synerzip.com> | 2013-12-31 12:58:21 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-13 14:46:30 +0100 |
| commit | 8e634d0d557bcad6bf56adb30d202e88675f17d1 (patch) | |
| tree | 89ad02366336b3fe81f7c4437f5f0f4bbefcaeac /writerfilter | |
| parent | a401dc5dcf2a5a4e8f427d3077d473be72ebbcf2 (diff) | |
fdo#69613: Code changes for TOC with flag '\w' should get preserved after RT.
Issue :
TOC field flag '\w' was not getting preserved after RT.
Implementation :
Provided import & export support for TOC field flag '\w'.
XML file difference :
In document.xml,
Before - <w:instrText>
TOC \o "1-3" \h \z \w
</w:instrText>
After - <w:instrText>
TOC \w \o "1-3" \o "1-3" \h
</w:instrText>
Conflicts:
sw/inc/tox.hxx
sw/inc/unomap.hxx
sw/inc/unoprnms.hxx
sw/source/core/unocore/unomap.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/ui/index/cntex.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyIds.hxx
Reviewed on:
https://gerrit.libreoffice.org/7238
Change-Id: Ia5d602c6db0b59933d325058ce2d8111e4f03df5
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 12 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyIds.cxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyIds.hxx | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index a5047a969ed8..3b9b52618763 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2696,6 +2696,7 @@ void DomainMapper_Impl::handleToc bool bFromOutline = false; bool bFromEntries = false; bool bHideTabLeaderPageNumbers = false ; + bool bIsTabEntry = false ; sal_Int16 nMaxLevel = 10; OUString sTemplate; @@ -2780,11 +2781,11 @@ void DomainMapper_Impl::handleToc bFromOutline = true; //todo: what doesn 'the applied paragraph outline level' refer to? } -// \w Preserve tab characters within table entries -// if( lcl_FindInCommand( pContext->GetCommand(), 'w', sValue )) -// { - //todo: not supported -// } +// \w Preserve tab characters within table entries + if( lcl_FindInCommand( pContext->GetCommand(), 'w', sValue )) + { + bIsTabEntry = true ; + } // \x Preserve newline characters within table entries // if( lcl_FindInCommand( pContext->GetCommand(), 'x', sValue )) // { @@ -2816,6 +2817,7 @@ void DomainMapper_Impl::handleToc 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 )); + xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_TAB_IN_TOC ), uno::makeAny( bIsTabEntry )); 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 dfe4369c18cf..669ae071e6bc 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -361,6 +361,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const 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 ; + case PROP_TAB_IN_TOC : sName = "TabInTOC"; 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 4f73caac3272..b8e6ae5d5340 100644 --- a/writerfilter/source/dmapper/PropertyIds.hxx +++ b/writerfilter/source/dmapper/PropertyIds.hxx @@ -332,6 +332,7 @@ enum PropertyIds ,PROP_CHAR_THEME_FILL ,PROP_HORIZONTAL_MERGE ,PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS + ,PROP_TAB_IN_TOC }; struct PropertyNameSupplier_Impl; class PropertyNameSupplier |