diff options
| author | ka <kai.ahrens@sun.com> | 2010-06-03 20:35:47 +0200 |
|---|---|---|
| committer | ka <kai.ahrens@sun.com> | 2010-06-03 20:35:47 +0200 |
| commit | 6e5f7e581dc5b8edcb78dc92a4d0c89d81f2aef9 (patch) | |
| tree | 2dd6e2841016be3eb86a0948395241118adccbc5 /svx/source/sdr | |
| parent | 13a131cfc6343d2f5693f3c3e9485cfe9e48f8ad (diff) | |
| parent | f8e7afbac976ca862a801b9648fd95b2107757b2 (diff) | |
impressbi01: latest changes
Diffstat (limited to 'svx/source/sdr')
| -rw-r--r-- | svx/source/sdr/properties/attributeproperties.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 5abd9c4b26f1..0f3325a0027e 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -259,6 +259,8 @@ namespace sdr void AttributeProperties::MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel) { + OSL_ASSERT(pNewModel!=NULL); + if(pSrcPool && pDestPool && (pSrcPool != pDestPool)) { if(mpItemSet) @@ -291,8 +293,24 @@ namespace sdr } else { - // StyleSheet is NOT from the correct pool; use default - ImpAddStyleSheet(pNewModel->GetDefaultStyleSheet(), sal_True); + // StyleSheet is NOT from the correct pool. + // Look one up in the right pool with the same + // name or use the default. + + // Look up the style in the new document. + OSL_ASSERT(pNewModel->GetStyleSheetPool() != NULL); + SfxStyleSheet* pNewStyleSheet = dynamic_cast<SfxStyleSheet*>( + pNewModel->GetStyleSheetPool()->Find( + pStySheet->GetName(), + SFX_STYLE_FAMILY_ALL)); + if (pNewStyleSheet == NULL + || &pNewStyleSheet->GetPool().GetPool() != pDestPool) + { + // There is no copy of the style in the new + // document. Use the default as a fallback. + pNewStyleSheet = pNewModel->GetDefaultStyleSheet(); + } + ImpAddStyleSheet(pNewStyleSheet, sal_True); } } |