diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-05-05 11:36:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-05 14:46:25 +0200 |
| commit | d78f53a31d050ac63c33a7219ef464d9906a37b8 (patch) | |
| tree | 3d7c4836564be0662e0e53574c64df1e62e7d386 /svl | |
| parent | 50724c796dbb52b73aa47a85d720d2e3200a0dec (diff) | |
pass SfxStyleFamily explicitly to SfxStyleSheetBasePool::ChangeParent
Change-Id: I7bc570899170b7a21e4d54e58d7a8ada0f79b918
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93469
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/items/style.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 9650cead61eb..e6e1adf23cb9 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -178,7 +178,7 @@ bool SfxStyleSheetBase::SetName(const OUString& rName, bool bReIndexNow) m_pPool->SetSearchMask(nFamily); if ( !aName.isEmpty() ) - m_pPool->ChangeParent( aName, rName, false ); + m_pPool->ChangeParent(aName, rName, nFamily, false); if ( aFollow == aName ) aFollow = rName; @@ -729,7 +729,7 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p ) return; // Adapt all styles which have this style as parent - ChangeParent( p->GetName(), p->GetParent() ); + ChangeParent(p->GetName(), p->GetParent(), p->GetFamily()); // #120015# Do not dispose, the removed StyleSheet may still be used in // existing SdrUndoAttrObj incarnations. Rely on refcounting for disposal, @@ -801,9 +801,10 @@ void SfxStyleSheetBasePool::Clear() void SfxStyleSheetBasePool::ChangeParent(const OUString& rOld, const OUString& rNew, + SfxStyleFamily eFamily, bool bVirtual) { - for( SfxStyleSheetBase* p = First(GetSearchFamily()); p; p = Next() ) + for( SfxStyleSheetBase* p = First(eFamily); p; p = Next() ) { if( p->GetParent() == rOld ) { |