diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-02 08:54:22 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-02 08:54:22 +0000 |
| commit | 1ca569c3e9ca51ed74ef5a0aa192cb5aaddb0a40 (patch) | |
| tree | 8afc8bdb655d2f20bd65800118f998404dd8a100 /svx/source/sdr/properties | |
| parent | 4e5834b7d87078b3418c37bf13ae1d0e7a02e2a5 (diff) | |
INTEGRATION: CWS impress139 (1.14.324); FILE MERGED
2008/03/17 12:49:32 cl 1.14.324.2: RESYNC: (1.14-1.15); FILE MERGED
2008/03/12 16:59:06 cl 1.14.324.1: #i79933# no defaults for presentation objects
Diffstat (limited to 'svx/source/sdr/properties')
| -rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 9b5e55f9e9..c58c6930a5 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -4,9 +4,9 @@ * * $RCSfile: textproperties.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2008-03-12 09:47:30 $ + * last change: $Author: kz $ $Date: 2008-04-02 09:54:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -414,6 +414,15 @@ namespace sdr void TextProperties::ForceDefaultAttributes() { SdrTextObj& rObj = (SdrTextObj&)GetSdrObject(); + + if( rObj.GetObjInventor() == SdrInventor ) + { + const sal_uInt16 nSdrObjKind = rObj.GetObjIdentifier(); + + if( nSdrObjKind == OBJ_TITLETEXT || nSdrObjKind == OBJ_OUTLINETEXT ) + return; // no defaults for presentation objects + } + bool bTextFrame(rObj.IsTextFrame()); // force ItemSet |