diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 16:21:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 16:21:32 +0000 |
| commit | c02c41aa40caefc2d560ff5a1c0a37e18e93e635 (patch) | |
| tree | a221b95f1d8a5543a334997fd84d3e5879e69156 /sw/source/filter/xml/wrtxml.cxx | |
| parent | INTEGRATION: CWS writercorehandoff (1.62.6); FILE MERGED (diff) | |
| download | core-c02c41aa40caefc2d560ff5a1c0a37e18e93e635.tar.gz core-c02c41aa40caefc2d560ff5a1c0a37e18e93e635.zip | |
INTEGRATION: CWS writercorehandoff (1.48.252); FILE MERGED
2006/04/05 13:22:15 tra 1.48.252.4: RESYNC: (1.50-1.51); FILE MERGED
2005/11/04 12:58:09 tra 1.48.252.3: #i50348#
2005/09/13 15:43:47 tra 1.48.252.2: RESYNC: (1.48-1.49); FILE MERGED
2005/08/31 12:51:08 tra 1.48.252.1: #i50348# Introducing IDocumentRedlineAccess interface
Diffstat (limited to 'sw/source/filter/xml/wrtxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index c27aaf6dc1b5..cde0c795731f 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -4,9 +4,9 @@ * * $RCSfile: wrtxml.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: ihi $ $Date: 2006-08-04 14:21:45 $ + * last change: $Author: hr $ $Date: 2006-08-14 17:21:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,7 +33,6 @@ * ************************************************************************/ - #pragma hdrstop #ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ @@ -305,12 +304,12 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, // save show redline mode ... OUString sShowChanges(RTL_CONSTASCII_USTRINGPARAM("ShowChanges")); sal_uInt16 nRedlineMode = pDoc->GetRedlineMode(); - sal_Bool bShowChanges( IsShowChanges( nRedlineMode ) ); + sal_Bool bShowChanges( IDocumentRedlineAccess::IsShowChanges( nRedlineMode ) ); aAny.setValue( &bShowChanges, ::getBooleanCppuType() ); xInfoSet->setPropertyValue( sShowChanges, aAny ); // ... and hide redlines for export - nRedlineMode &= ~REDLINE_SHOW_MASK; - nRedlineMode |= REDLINE_SHOW_INSERT; + nRedlineMode &= ~IDocumentRedlineAccess::REDLINE_SHOW_MASK; + nRedlineMode |= IDocumentRedlineAccess::REDLINE_SHOW_INSERT; pDoc->SetRedlineMode( nRedlineMode ); // Set base URI @@ -502,10 +501,10 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, // restore redline mode aAny = xInfoSet->getPropertyValue( sShowChanges ); nRedlineMode = pDoc->GetRedlineMode(); - nRedlineMode &= ~REDLINE_SHOW_MASK; - nRedlineMode |= REDLINE_SHOW_INSERT; + nRedlineMode &= ~IDocumentRedlineAccess::REDLINE_SHOW_MASK; + nRedlineMode |= IDocumentRedlineAccess::REDLINE_SHOW_INSERT; if ( *(sal_Bool*)aAny.getValue() ) - nRedlineMode |= REDLINE_SHOW_DELETE; + nRedlineMode |= IDocumentRedlineAccess::REDLINE_SHOW_DELETE; pDoc->SetRedlineMode( nRedlineMode ); if (xStatusIndicator.is()) |