diff options
| author | David Tardon <dtardon@redhat.com> | 2014-12-08 18:06:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-04 20:54:37 +0000 |
| commit | 919719d02692d453c4140135a8da3e9508a88042 (patch) | |
| tree | 3a3510b373a7c96bdc9baad4c9ddbe5d35fe5b9f /sd | |
| parent | cda3b8767fd8f5b43b1043852e9f90fd17a129f4 (diff) | |
don't copy stylesheet's HelpID if this's a rename
This causes problems for renamed copies of std. styles, as they have
special handling in SdStyleSheet::SetHelpId, which would set the API
name to std. value too. That means that there would be two (or more)
stylesheets with the same API name. On export, only one of them would be
exported.
Change-Id: I19d243bd3f73995e8de2d251e3d8b7f93219c3a9
(cherry picked from commit e4cf5d1a98469c17133f33fc8220e6b41f65e9a0)
Reviewed-on: https://gerrit.libreoffice.org/13574
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/stlpool.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 5e4b30f7a754..67f03463f008 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -697,7 +697,8 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily if( !aParent.isEmpty() ) aNewStyles.push_back( std::pair< rtl::Reference< SfxStyleSheetBase >, OUString >( xNewSheet, aParent ) ); - xNewSheet->SetHelpId( aHelpFile, xSheet->GetHelpId( aHelpFile ) ); + if( !bAddToList ) + xNewSheet->SetHelpId( aHelpFile, xSheet->GetHelpId( aHelpFile ) ); xNewSheet->GetItemSet().Put( xSheet->GetItemSet() ); rCreatedSheets.push_back( SdStyleSheetRef( static_cast< SdStyleSheet* >( xNewSheet.get() ) ) ); |