diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-13 11:03:17 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-15 11:11:47 +0100 |
| commit | cd1c9f5167e797807d6726219f06190657f58372 (patch) | |
| tree | 08a6738c5972b1004fb92720b0f375a1af72f685 /sw/source/uibase/app | |
| parent | 0665ec46aa099e556b7d1fc19f60efc90747e798 (diff) | |
tdf#135014 sw: fix crash exporting numbering to DOCX
It can happen that the default SwNumRule of a SwList isn't used by
anything directly, but there are other SwNumRule associated with that
SwList and then the DOCX export needs to export it as an abstract
numbering definition.
(regression from 632ee9aae6d5f3cf08b6d6b2789310c20db713b7)
Change-Id: I6b1851980464aaa95bf731a60b7d11ab91cec7b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109303
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/source/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/docstyle.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index d824ac393cbd..e6eff2f4322b 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -2250,7 +2250,7 @@ bool SwDocStyleSheet::IsUsed() const case SfxStyleFamily::Page : pMod = pDesc; break; case SfxStyleFamily::Pseudo: - return pNumRule && SwDoc::IsUsed( *pNumRule ); + return pNumRule && rDoc.IsUsed(*pNumRule); case SfxStyleFamily::Table: return pTableFormat && rDoc.IsUsed( *pTableFormat ); @@ -3015,7 +3015,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() if ( nSrchMask == SfxStyleSearchBits::Hidden && !rRule.IsHidden( ) ) continue; - bool bUsed = bIsSearchUsed && ( bOrganizer || SwDoc::IsUsed(rRule) ); + bool bUsed = bIsSearchUsed && (bOrganizer || rDoc.IsUsed(rRule)); if( !bUsed ) { if( ( !bSearchHidden && rRule.IsHidden() ) || @@ -3177,7 +3177,7 @@ void SwStyleSheetIterator::AppendStyleList(const std::vector<OUString>& rList, case SwGetPoolIdFromName::NumRule: { SwNumRule* pRule = rDoc.FindNumRulePtr( i ); - bUsed = pRule && SwDoc::IsUsed( *pRule ); + bUsed = pRule && rDoc.IsUsed(*pRule); bHidden = pRule && pRule->IsHidden( ); } break; |