diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 08:44:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 08:44:28 +0000 |
| commit | fab2ade0d74cccea6b90244a354becd9015942fe (patch) | |
| tree | 2c837b1370487985032631d3ebcef54dbc888cea /xmloff | |
| parent | 0a36849fa3483d7c9110f31cdef0b7dd2ed25f2b (diff) | |
INTEGRATION: CWS oj14 (1.16.4); FILE MERGED
2007/02/20 14:40:57 ama 1.16.4.1: Fix #i71935#: Para/Text-properties set by cell style
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/style/prstylei.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 48e8418c8ee9..092f3abc4b04 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -4,9 +4,9 @@ * * $RCSfile: prstylei.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2007-06-27 15:43:12 $ + * last change: $Author: rt $ $Date: 2007-07-06 09:44:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -248,6 +248,8 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite ) OUString sParent( GetParentName() ); if( sParent.getLength() ) sParent = GetImport().GetStyleDisplayName( GetFamily(), sParent ); + else + sParent = rtl::OUString::createFromAscii("Standard"); pProps->Value <<= sParent; ++pProps; pProps->Name = rtl::OUString::createFromAscii("ParaConditionalStyleName"); |