Kaydet (Commit) 40c6073d authored tarafından Rüdiger Timm's avatar Rüdiger Timm

INTEGRATION: CWS impress5ea1 (1.108.102); FILE MERGED

2004/03/13 23:30:21 cl 1.108.102.2: RESYNC: (1.108-1.109); FILE MERGED
2004/03/11 14:54:31 cl 1.108.102.1: #17343# skip invalid properties
üst ad9ac6d0
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: txtparae.cxx,v $ * $RCSfile: txtparae.cxx,v $
* *
* $Revision: 1.109 $ * $Revision: 1.110 $
* *
* last change: $Author: hr $ $Date: 2004-03-11 16:28:14 $ * last change: $Author: rt $ $Date: 2004-03-30 14:31:57 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -442,6 +442,9 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, ...@@ -442,6 +442,9 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
nIgnoreProps < 2 && i != xPropStates.end(); nIgnoreProps < 2 && i != xPropStates.end();
i++ ) i++ )
{ {
if( i->mnIndex == -1 )
continue;
switch( xPM->GetEntryContextId(i->mnIndex) ) switch( xPM->GetEntryContextId(i->mnIndex) )
{ {
case CTF_CHAR_STYLE_NAME: case CTF_CHAR_STYLE_NAME:
...@@ -632,6 +635,9 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( ...@@ -632,6 +635,9 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
nIgnoreProps < 2 && i != xPropStates.end(); nIgnoreProps < 2 && i != xPropStates.end();
i++ ) i++ )
{ {
if( i->mnIndex )
continue;
switch( xPM->GetEntryContextId(i->mnIndex) ) switch( xPM->GetEntryContextId(i->mnIndex) )
{ {
case CTF_CHAR_STYLE_NAME: case CTF_CHAR_STYLE_NAME:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment