diff options
| author | David Tardon <dtardon@redhat.com> | 2014-12-08 18:06:01 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-12-08 18:34:12 +0100 |
| commit | e4cf5d1a98469c17133f33fc8220e6b41f65e9a0 (patch) | |
| tree | afdb8132b87dc80956f2905fdd5bf5ed533dcd07 /sd | |
| parent | typo (diff) | |
| download | core-e4cf5d1a98469c17133f33fc8220e6b41f65e9a0.tar.gz core-e4cf5d1a98469c17133f33fc8220e6b41f65e9a0.zip | |
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
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 095054ee24f2..94f8f96e5b26 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -699,7 +699,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() ) ) ); |