diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:36:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:36:15 +0000 |
| commit | e02f9c76994657c9df9aeca94b831b2cff91a3a1 (patch) | |
| tree | f0c6055b284b89137b6371e7531fdc78f9ed6dfd /sw/source/ui/app/docsh.cxx | |
| parent | 11a2ca867f03a0287e97c2369983748a628898f7 (diff) | |
INTEGRATION: CWS swstability03 (1.57.158); FILE MERGED
2006/07/12 09:25:36 ama 1.57.158.1: #i65094#: Do not copy OLE objects during SaveAs
Diffstat (limited to 'sw/source/ui/app/docsh.cxx')
| -rw-r--r-- | sw/source/ui/app/docsh.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 3ec8490a42a5..e84a6aa87bc0 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docsh.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: obo $ $Date: 2006-07-14 08:32:42 $ + * last change: $Author: kz $ $Date: 2006-07-19 09:36:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -632,6 +632,10 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) } // <-- + sal_uInt16 nRedlineMode = pDoc->GetRedlineMode(); + // Hide redlines for export + pDoc->SetRedlineMode( REDLINE_SHOW_INSERT ); + ULONG nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE; uno::Reference < embed::XStorage > xStor = rMedium.GetOutputStorage(); if( SfxObjectShell::SaveAs( rMedium ) ) @@ -701,6 +705,9 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) } SetError( nErr ? nErr : nVBWarning ); + // ... and restore redline mode + pDoc->SetRedlineMode( nRedlineMode ); + return !IsError( nErr ); } |