diff options
| author | Michael Brauer <mib@openoffice.org> | 2001-02-06 14:56:00 +0000 |
|---|---|---|
| committer | Michael Brauer <mib@openoffice.org> | 2001-02-06 14:56:00 +0000 |
| commit | b6e9e6c94d8a3942aec1af6ce2d388aa95f6455c (patch) | |
| tree | 72f53f48baef44cb124ed392b0725d5cfc77fab6 /sw/source/core/draw | |
| parent | a05c341452eb85f07013105170198963428f3784 (diff) | |
real 6.0 file format
Diffstat (limited to 'sw/source/core/draw')
| -rw-r--r-- | sw/source/core/draw/drawdoc.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index c25d313560a3..a9bfbc06f1ed 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawdoc.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: ka $ $Date: 2000-12-03 17:02:17 $ + * last change: $Author: mib $ $Date: 2001-02-06 15:53:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -239,7 +239,7 @@ SvStream* SwDrawDocument::GetDocumentStream( SdrDocumentStreamInfo& rInfo ) cons long nFFVersion = xRoot->GetVersion(); ASSERT( nFFVersion == SOFFICE_FILEFORMAT_31 || nFFVersion == SOFFICE_FILEFORMAT_40 || - nFFVersion == SOFFICE_FILEFORMAT_NOW, + nFFVersion == SOFFICE_FILEFORMAT_50, "Am Root-Storage ist keine FF-Version gesetzt!" ); // Wenn eine 3.1-Clipboard-ID gesetzt ist, die Fileformat-Version @@ -260,6 +260,15 @@ SvStream* SwDrawDocument::GetDocumentStream( SdrDocumentStreamInfo& rInfo ) cons "Fileformat-Version auf 4.0 umgesetzt" ); xRoot->SetVersion( nFFVersion = SOFFICE_FILEFORMAT_40 ); } + else if( ( SOT_FORMATSTR_ID_STARWRITER_50 == xRoot->GetFormat() || + SOT_FORMATSTR_ID_STARWRITERWEB_50 == xRoot->GetFormat() || + SOT_FORMATSTR_ID_STARWRITERGLOB_50 == xRoot->GetFormat() ) && + nFFVersion != SOFFICE_FILEFORMAT_50 ) + { + ASSERT( nFFVersion == SOFFICE_FILEFORMAT_50, + "Fileformat-Version auf 4.0 umgesetzt" ); + xRoot->SetVersion( nFFVersion = SOFFICE_FILEFORMAT_50 ); + } pRet = xRoot->OpenStream( sDrawStrmNm, STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE ); |