diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:39:18 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:39:18 +0000 |
| commit | e93ac62f84f7d8d4d17ba2ea0fbeb8131ccc9db7 (patch) | |
| tree | f499fa79ced2c7cd97fd591aff62f86d32b76e42 /sot | |
| parent | 9c6aa20a4c4b8700359d3eb4778d592005c33396 (diff) | |
INTEGRATION: CWS hr50 (1.95.26); FILE MERGED
2008/03/03 13:58:17 hr 1.95.26.1: #i86574#: fix warning (gcc-4.2.3)
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index d97bd859193a..4af0d2b24350 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ucbstorage.cxx,v $ - * $Revision: 1.96 $ + * $Revision: 1.97 $ * * This file is part of OpenOffice.org. * @@ -650,12 +650,15 @@ String UCBStorageElement_Impl::GetContentType() void UCBStorageElement_Impl::SetContentType( const String& rType ) { - if ( m_xStream.Is() ) + if ( m_xStream.Is() ) { m_xStream->m_aContentType = m_xStream->m_aOriginalContentType = rType; - else if ( m_xStorage.Is() ) + } + else if ( m_xStorage.Is() ) { m_xStorage->m_aContentType = m_xStorage->m_aOriginalContentType = rType; - else + } + else { DBG_ERROR("Element not loaded!"); + } } String UCBStorageElement_Impl::GetOriginalContentType() |