diff options
| author | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2010-03-17 17:42:25 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2010-03-17 17:42:25 +0100 |
| commit | 629d81e637451e914888cc766c36c2ce0c10b2db (patch) | |
| tree | 777a74d2927b6ccb6b606d070bd609ac1d645880 /svx/source/sdr/properties | |
| parent | e44fdc694664bd5fb78274002a87381ff406d8c3 (diff) | |
impress187 #i109515# avoid styles from other ItemPools
Diffstat (limited to 'svx/source/sdr/properties')
| -rw-r--r-- | svx/source/sdr/properties/attributeproperties.cxx | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 2bc06ea473..8c97ea69bd 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -281,7 +281,19 @@ namespace sdr // set stylesheet (if used) if(pStySheet) { - ImpAddStyleSheet(pStySheet, sal_True); + // #i109515# + SfxItemPool* pStyleSheetPool = &pStySheet->GetPool().GetPool(); + + if(pStyleSheetPool == pDestPool) + { + // just re-set stylesheet + ImpAddStyleSheet(pStySheet, sal_True); + } + else + { + // StyleSheet is NOT from the correct pool; use default + ImpAddStyleSheet(pNewModel->GetDefaultStyleSheet(), sal_True); + } } delete pOldSet; |