|
 |
ebc4bd |
From e4cf5d1a98469c17133f33fc8220e6b41f65e9a0 Mon Sep 17 00:00:00 2001
|
|
|
ebc4bd |
From: David Tardon <dtardon@redhat.com>
|
|
|
ebc4bd |
Date: Mon, 8 Dec 2014 18:06:01 +0100
|
|
|
ebc4bd |
Subject: [PATCH] don't copy stylesheet's HelpID if this's a rename
|
|
|
ebc4bd |
|
|
|
ebc4bd |
This causes problems for renamed copies of std. styles, as they have
|
|
|
ebc4bd |
special handling in SdStyleSheet::SetHelpId, which would set the API
|
|
|
ebc4bd |
name to std. value too. That means that there would be two (or more)
|
|
|
ebc4bd |
stylesheets with the same API name. On export, only one of them would be
|
|
|
ebc4bd |
exported.
|
|
|
ebc4bd |
|
|
|
ebc4bd |
Change-Id: I19d243bd3f73995e8de2d251e3d8b7f93219c3a9
|
|
|
ebc4bd |
---
|
|
|
ebc4bd |
sd/source/core/stlpool.cxx | 3 ++-
|
|
|
ebc4bd |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
ebc4bd |
|
|
|
ebc4bd |
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
|
|
|
ebc4bd |
index 095054e..94f8f96 100644
|
|
|
ebc4bd |
--- a/sd/source/core/stlpool.cxx
|
|
|
ebc4bd |
+++ b/sd/source/core/stlpool.cxx
|
|
|
ebc4bd |
@@ -699,7 +699,8 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily
|
|
|
ebc4bd |
if( !aParent.isEmpty() )
|
|
|
ebc4bd |
aNewStyles.push_back( std::pair< rtl::Reference< SfxStyleSheetBase >, OUString >( xNewSheet, aParent ) );
|
|
|
ebc4bd |
|
|
|
ebc4bd |
- xNewSheet->SetHelpId( aHelpFile, xSheet->GetHelpId( aHelpFile ) );
|
|
|
ebc4bd |
+ if( !bAddToList )
|
|
|
ebc4bd |
+ xNewSheet->SetHelpId( aHelpFile, xSheet->GetHelpId( aHelpFile ) );
|
|
|
ebc4bd |
xNewSheet->GetItemSet().Put( xSheet->GetItemSet() );
|
|
|
ebc4bd |
|
|
|
ebc4bd |
rCreatedSheets.push_back( SdStyleSheetRef( static_cast< SdStyleSheet* >( xNewSheet.get() ) ) );
|
|
|
ebc4bd |
--
|
|
|
ebc4bd |
2.1.0
|
|
|
ebc4bd |
|