diff options
author | Justin Luth <justin_luth@sil.org> | 2018-05-12 20:53:45 +0300 |
---|---|---|
committer | Justin Luth <justin_luth@sil.org> | 2018-05-24 05:36:53 +0200 |
commit | 8d42de21c10bfefeaffabc5c939e7830a09f7dca (patch) | |
tree | 3ac7f116d03c2e93c6107b5c42652726e5a0252d /writerfilter | |
parent | 6fecbff9810ae9afc2de8c4d5e9e8a8a511d1f2d (diff) |
revert tdf#76817 ooxmlimport: connect Heading to existing numbers
tdf#50774 has an example document which was broken by 6.1 commit
8e9e705de29a1a3d9b964c9350aa2a3a17cce6f9.
Reverting does a couple of things:
-go back to previous behaviour (right or wrong) - no regression.
-gives an opportunity to find documents broken by reverting -
i.e. it will give an indication as to which state has more broken
docs. Can be re-visited in 6.2.
-gives me an option to escape from this horrible mess without causing
a regression in a production release of LO.
Change-Id: Ib594b76d5533a0c4807cf70ef706c107e52cddcf
Reviewed-on: https://gerrit.libreoffice.org/54293
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'writerfilter')
4 files changed, 1 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 409c7083ad7e..f84f37536f93 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1132,8 +1132,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap ) sal_Int32 nListId = pEntry ? lcl_getListId(pEntry, GetStyleSheetTable()) : -1; if( pStyleSheetProperties && nListId >= 0 ) { - if ( !pEntry->bIsChapterNumbering ) - pParaContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::makeAny( ListDef::GetStyleName( nListId ) ), false); + pParaContext->Insert( PROP_NUMBERING_STYLE_NAME, uno::makeAny( ListDef::GetStyleName( nListId ) ), false); // Indent properties from the paragraph style have priority // over the ones from the numbering styles in Word diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 8e14b3a32dbc..f3679f8eb614 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -625,7 +625,6 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, xOutlines->getChapterNumberingRules( ); StyleSheetEntryPtr pParaStyle = pAbsLevel->GetParaStyle( ); - pParaStyle->bIsChapterNumbering = true; aLvlProps.push_back(comphelper::makePropertyValue(getPropertyName(PROP_HEADING_STYLE_NAME), pParaStyle->sConvertedStyleName)); xOutlineRules->replaceByIndex(nLevel, uno::makeAny(comphelper::containerToSequence(aLvlProps))); diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 398a7ab0086f..7e28500a11c0 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -56,7 +56,6 @@ typedef ::std::map< OUString, OUString> StringPairMap_t; StyleSheetEntry::StyleSheetEntry() : sStyleIdentifierD() ,bIsDefaultStyle(false) - ,bIsChapterNumbering(false) ,bInvalidHeight(false) ,bHasUPE(false) ,nStyleTypeCode(STYLE_TYPE_UNKNOWN) @@ -75,7 +74,6 @@ TableStyleSheetEntry::TableStyleSheetEntry( StyleSheetEntry const & rEntry ): StyleSheetEntry( ) { bIsDefaultStyle = rEntry.bIsDefaultStyle; - bIsChapterNumbering = rEntry.bIsChapterNumbering; bInvalidHeight = rEntry.bInvalidHeight; bHasUPE = rEntry.bHasUPE; nStyleTypeCode = STYLE_TYPE_TABLE; diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 767a16af3dfb..dc1f0acf3eb5 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -55,7 +55,6 @@ class StyleSheetEntry public: OUString sStyleIdentifierD; // WW8 name bool bIsDefaultStyle; - bool bIsChapterNumbering; //LO built-in Chapter Numbering "Outline" list style bool bInvalidHeight; bool bHasUPE; //universal property expansion StyleType nStyleTypeCode; //sgc |