diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-17 15:10:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-17 15:10:01 +0000 |
| commit | 19f604f29fc2717a4d29f1f9d3c622e410044f41 (patch) | |
| tree | badd2c044a01443915c204bd2dddbad2df6288ef /sfx2 | |
| parent | 55b5b6611e29ee71bfb009301bbd73dea3f24a9b (diff) | |
INTEGRATION: CWS os8 (1.21.2); FILE MERGED
2003/04/10 08:31:02 mba 1.21.2.1: #108773#: always retrieve MimeType for storage formats
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docinf.cxx | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index 053998c225c9..b728046072c8 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docinf.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: hr $ $Date: 2003-04-04 17:36:01 $ + * last change: $Author: vg $ $Date: 2003-04-17 16:10:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,7 @@ #include <svtools/saveopt.hxx> #include <tools/tenccvt.hxx> #include <svtools/useroptions.hxx> +#include <sot/exchange.hxx> #include "rtl/tencinfo.h" #include "docfilt.hxx" @@ -1150,7 +1151,18 @@ BOOL SfxDocumentInfo::Load(SvStorage* pStorage) return FALSE; aStr->SetVersion( pStorage->GetVersion() ); aStr->SetBufferSize(STREAM_BUFFER_SIZE); - return Load(*aStr); + BOOL bRet = Load(*aStr); + if ( bRet ) + { + String aStr = SotExchange::GetFormatMimeType( pStorage->GetFormat() ); + USHORT nPos = aStr.Search(';'); + if ( nPos != STRING_NOTFOUND ) + pImp->aSpecialMimeType = aStr.Copy( 0, nPos ); + else + pImp->aSpecialMimeType = aStr; + } + + return bRet; } //------------------------------------------------------------------------- |