strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress139 (1.14.324); FILE MERGED

Browse source 
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
This commit is contained in:
Kurt Zenker 2008-04-02 08:54:22 +00:00
parent cf939ca11c
commit 3d6f5c0685
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
svx/source/sdr/properties/textproperties.cxx
View file

@ -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