diff options
author | Kurt Zenker <kz@openoffice.org> | 2010-04-09 12:17:25 +0200 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2010-04-09 12:17:25 +0200 |
commit | 42c4f3b631f984945bb02773f490788c4211f86b (patch) | |
tree | 31e090fdeb1232db0d4abf0cbbdf69532faf7f63 | |
parent | 6a7091ded51f720ede2d20ffdecae053d08b5390 (diff) | |
parent | 1bda93b620a9d8fe93dff4628f7ed61d34cc2e78 (diff) |
CWS-TOOLING: integrate CWS impress187
-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 e30b2c2e0b..18f420c418 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; |