diff options
author | Christian Lippka <cl@openoffice.org> | 2001-11-22 12:55:22 +0000 |
---|---|---|
committer | Christian Lippka <cl@openoffice.org> | 2001-11-22 12:55:22 +0000 |
commit | ee7f835d7982f05757f71728803c9f96c1c0bb6a (patch) | |
tree | 28a2165942f9473654d75192569cb5c9d0b5d464 /svx/source/svdraw/svdoattr.cxx | |
parent | fe14dfd5bf643d8213bd213e697750d72cb52de2 (diff) |
#90330# optimized setModel()
Diffstat (limited to 'svx/source/svdraw/svdoattr.cxx')
-rw-r--r-- | svx/source/svdraw/svdoattr.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index ee06240d87d9..3ca4369835b8 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdoattr.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: aw $ $Date: 2001-11-14 10:52:37 $ + * last change: $Author: cl $ $Date: 2001-11-22 13:55:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -733,6 +733,12 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel) // Jedes Objekt bekommt initial den DefaultStyleSheet // des Model, falls noch kein StyleSheet gesetzt. if(mpObjectItemSet && !GetStyleSheet() && pModel && !pModel->IsLoading()) + NbcSetStyleSheet(pModel->GetDefaultStyleSheet(), TRUE); + +/* this code was removed because NbcSetStyleSheet called with TRUE does not + alter the hard attributes. So they don't need to be restored, a useless + process that cost us up to 20% for xml import. Also there is a memory + leek with aSet.Put( *pItem->Clone() ); { SfxStyleSheet* pDefSS = pModel->GetDefaultStyleSheet(); @@ -770,6 +776,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel) NbcSetStyleSheet(pDefSS, TRUE); } } +*/ } } |