diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 08:32:10 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 08:32:10 +0000 |
commit | 9caed0ee471a48da08a1b3ed9798e1c45ae62e41 (patch) | |
tree | 0e4caaa77c9edaef7e7245df0013122ffae9fdc1 /sw/source/filter/xml/xmlexp.cxx | |
parent | f4affa0011e5e96e776953728b548b19cbedbb76 (diff) |
INTEGRATION: CWS osxpatchpool (1.82.14); FILE MERGED
2006/08/28 12:33:45 obr 1.82.14.1: #i68810# applied 2nd patch from issue (tra)
Diffstat (limited to 'sw/source/filter/xml/xmlexp.cxx')
-rw-r--r-- | sw/source/filter/xml/xmlexp.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 035c92194ff6..a4cc7c85d6e6 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlexp.cxx,v $ * - * $Revision: 1.83 $ + * $Revision: 1.84 $ * - * last change: $Author: obo $ $Date: 2006-09-16 22:28:10 $ + * last change: $Author: vg $ $Date: 2006-09-25 09:32:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -470,7 +470,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) // now save and switch redline mode nRedlineMode = pDoc->GetRedlineMode(); pDoc->SetRedlineMode( - ( nRedlineMode & IDocumentRedlineAccess::REDLINE_SHOW_MASK ) | IDocumentRedlineAccess::REDLINE_INSERT ); + (IDocumentRedlineAccess::RedlineMode_t)(( nRedlineMode & IDocumentRedlineAccess::REDLINE_SHOW_MASK ) | IDocumentRedlineAccess::REDLINE_INSERT )); } sal_uInt32 nRet = SvXMLExport::exportDoc( eClass ); @@ -478,7 +478,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) // now we can restore the redline mode (if we changed it previously) if( bSaveRedline ) { - pDoc->SetRedlineMode( nRedlineMode ); + pDoc->SetRedlineMode( (IDocumentRedlineAccess::RedlineMode_t)(nRedlineMode )); } |