diff options
| author | alg <alg@apache.org> | 2011-10-06 14:55:24 +0000 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-24 00:09:55 +0100 |
| commit | c8e7d34e3a238c9383151a09f99e7951877a6821 (patch) | |
| tree | b78f63f3153fefe06301ad9fe8e2d602fe65244a /svx | |
| parent | f82da782158d8f5b89a6a9057df1a4695425ed75 (diff) | |
118414: applied patch, added forcing that SfxItemSet inside AttributeProperties::SetModel
* found as LGPLv3-only fix at svn rev 1179654 (http://svn.apache.org/viewvc?view=revision&revision=1179654)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/properties/attributeproperties.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 9edc2a430498..cece99f570db 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -479,8 +479,9 @@ namespace sdr } // each object gets the default Style if there is none set yet. - if(mpItemSet && !GetStyleSheet() && pNewModel && !pNewModel->IsLoading()) + if(!GetStyleSheet() && pNewModel && !pNewModel->IsLoading()) { + GetObjectItemSet(); // i#118414 force ItemSet to allow style to be set SetStyleSheet(pNewModel->GetDefaultStyleSheet(), sal_True); } } |