diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 08:55:29 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 08:55:29 +0000 |
| commit | 22fad654917a2b9cc1676cb8bfc834ff97d95ee7 (patch) | |
| tree | ff557658786b333fd4c3857776661545397f61b5 /xmloff | |
| parent | 3ff6e1cc4c39f4eba42e330bf74f3ca6802c9c9e (diff) | |
INTEGRATION: CWS mib08 (1.40.12); FILE MERGED
2008/06/24 12:18:54 mib 1.40.12.1: #i90986# fo:clip
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtexppr.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 177f4699f7c7..2d8268fc09ab 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: txtexppr.cxx,v $ - * $Revision: 1.40 $ + * $Revision: 1.41 $ * * This file is part of OpenOffice.org. * @@ -451,6 +451,10 @@ void XMLTextExportPropertySetMapper::ContextFilter( // filter list style name XMLPropertyState* pListStyleName = NULL; + // filter fo:clip + XMLPropertyState* pClip11State = NULL; + XMLPropertyState* pClipState = NULL; + sal_Bool bNeedsAnchor = sal_False; for( ::std::vector< XMLPropertyState >::iterator aIter = rProperties.begin(); @@ -565,6 +569,8 @@ void XMLTextExportPropertySetMapper::ContextFilter( case CTF_UNDERLINE_COLOR: pUnderlineColorState = propertie; break; case CTF_UNDERLINE_HASCOLOR: pUnderlineHasColorState = propertie; break; case CTF_NUMBERINGSTYLENAME: pListStyleName = propertie; break; + case CTF_TEXT_CLIP11: pClip11State = propertie; break; + case CTF_TEXT_CLIP: pClipState = propertie; break; } } @@ -1001,6 +1007,9 @@ void XMLTextExportPropertySetMapper::ContextFilter( pListStyleName->mnIndex = -1; } + if( pClipState != NULL && pClip11State != NULL ) + pClip11State->mnIndex = -1; + SvXMLExportPropertyMapper::ContextFilter(rProperties,rPropSet); } |